diff --git a/src/Umbraco.Core/Cache/CacheRefresherCollectionBuilder.cs b/src/Umbraco.Abstractions/Cache/CacheRefresherCollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Core/Cache/CacheRefresherCollectionBuilder.cs
rename to src/Umbraco.Abstractions/Cache/CacheRefresherCollectionBuilder.cs
diff --git a/src/Umbraco.Core/Cache/FastDictionaryAppCache.cs b/src/Umbraco.Abstractions/Cache/FastDictionaryAppCache.cs
similarity index 80%
rename from src/Umbraco.Core/Cache/FastDictionaryAppCache.cs
rename to src/Umbraco.Abstractions/Cache/FastDictionaryAppCache.cs
index b38f36a7d8..159f9cd7cb 100644
--- a/src/Umbraco.Core/Cache/FastDictionaryAppCache.cs
+++ b/src/Umbraco.Abstractions/Cache/FastDictionaryAppCache.cs
@@ -10,24 +10,33 @@ namespace Umbraco.Core.Cache
     /// <summary>
     /// Implements a fast <see cref="IAppCache"/> on top of a concurrent dictionary.
     /// </summary>
-    internal class FastDictionaryAppCache : IAppCache
+    public class FastDictionaryAppCache : IAppCache
     {
+        private readonly ITypeFinder _typeFinder;
+
+        public FastDictionaryAppCache(ITypeFinder typeFinder)
+        {
+            _typeFinder = typeFinder ?? throw new ArgumentNullException(nameof(typeFinder));
+        }
+
         /// <summary>
         /// Gets the internal items dictionary, for tests only!
         /// </summary>
-        internal readonly ConcurrentDictionary<string, Lazy<object>> Items = new ConcurrentDictionary<string, Lazy<object>>();
+        private readonly ConcurrentDictionary<string, Lazy<object>> _items = new ConcurrentDictionary<string, Lazy<object>>();
+
+        public int Count => _items.Count;
 
         /// <inheritdoc />
         public object Get(string cacheKey)
         {
-            Items.TryGetValue(cacheKey, out var result); // else null
+            _items.TryGetValue(cacheKey, out var result); // else null
             return result == null ? null : SafeLazy.GetSafeLazyValue(result); // return exceptions as null
         }
 
         /// <inheritdoc />
         public object Get(string cacheKey, Func<object> getCacheItem)
         {
-            var result = Items.GetOrAdd(cacheKey, k => SafeLazy.GetSafeLazy(getCacheItem));
+            var result = _items.GetOrAdd(cacheKey, k => SafeLazy.GetSafeLazy(getCacheItem));
 
             var value = result.Value; // will not throw (safe lazy)
             if (!(value is SafeLazy.ExceptionHolder eh))
@@ -37,7 +46,7 @@ namespace Umbraco.Core.Cache
             // which would trick with GetSafeLazyValue, we need to remove by ourselves,
             // in order NOT to cache exceptions
 
-            Items.TryRemove(cacheKey, out result);
+            _items.TryRemove(cacheKey, out result);
             eh.Exception.Throw(); // throw once!
             return null; // never reached
         }
@@ -45,7 +54,7 @@ namespace Umbraco.Core.Cache
         /// <inheritdoc />
         public IEnumerable<object> SearchByKey(string keyStartsWith)
         {
-            return Items
+            return _items
                 .Where(kvp => kvp.Key.InvariantStartsWith(keyStartsWith))
                 .Select(kvp => SafeLazy.GetSafeLazyValue(kvp.Value))
                 .Where(x => x != null);
@@ -55,7 +64,7 @@ namespace Umbraco.Core.Cache
         public IEnumerable<object> SearchByRegex(string regex)
         {
             var compiled = new Regex(regex, RegexOptions.Compiled);
-            return Items
+            return _items
                 .Where(kvp => compiled.IsMatch(kvp.Key))
                 .Select(kvp => SafeLazy.GetSafeLazyValue(kvp.Value))
                 .Where(x => x != null);
@@ -64,23 +73,23 @@ namespace Umbraco.Core.Cache
         /// <inheritdoc />
         public void Clear()
         {
-            Items.Clear();
+            _items.Clear();
         }
 
         /// <inheritdoc />
         public void Clear(string key)
         {
-            Items.TryRemove(key, out _);
+            _items.TryRemove(key, out _);
         }
 
         /// <inheritdoc />
         public void ClearOfType(string typeName)
         {
-            var type = TypeFinder.GetTypeByName(typeName);
+            var type = _typeFinder.GetTypeByName(typeName);
             if (type == null) return;
             var isInterface = type.IsInterface;
 
-            foreach (var kvp in Items
+            foreach (var kvp in _items
                 .Where(x =>
                 {
                     // entry.Value is Lazy<object> and not null, its value may be null
@@ -92,7 +101,7 @@ namespace Umbraco.Core.Cache
                     // otherwise remove exact types (not inherited types)
                     return value == null || (isInterface ? (type.IsInstanceOfType(value)) : (value.GetType() == type));
                 }))
-                Items.TryRemove(kvp.Key, out _);
+                _items.TryRemove(kvp.Key, out _);
         }
 
         /// <inheritdoc />
@@ -101,7 +110,7 @@ namespace Umbraco.Core.Cache
             var typeOfT = typeof(T);
             var isInterface = typeOfT.IsInterface;
 
-            foreach (var kvp in Items
+            foreach (var kvp in _items
                 .Where(x =>
                 {
                     // entry.Value is Lazy<object> and not null, its value may be null
@@ -114,7 +123,7 @@ namespace Umbraco.Core.Cache
                     // otherwise remove exact types (not inherited types)
                     return value == null || (isInterface ? (value is T) : (value.GetType() == typeOfT));
                 }))
-                Items.TryRemove(kvp.Key, out _);
+                _items.TryRemove(kvp.Key, out _);
         }
 
         /// <inheritdoc />
@@ -123,7 +132,7 @@ namespace Umbraco.Core.Cache
             var typeOfT = typeof(T);
             var isInterface = typeOfT.IsInterface;
 
-            foreach (var kvp in Items
+            foreach (var kvp in _items
                 .Where(x =>
                 {
                     // entry.Value is Lazy<object> and not null, its value may be null
@@ -139,24 +148,24 @@ namespace Umbraco.Core.Cache
                             // run predicate on the 'public key' part only, ie without prefix
                             && predicate(x.Key, (T)value);
                 }))
-                Items.TryRemove(kvp.Key, out _);
+                _items.TryRemove(kvp.Key, out _);
         }
 
         /// <inheritdoc />
         public void ClearByKey(string keyStartsWith)
         {
-            foreach (var ikvp in Items
+            foreach (var ikvp in _items
                 .Where(kvp => kvp.Key.InvariantStartsWith(keyStartsWith)))
-                Items.TryRemove(ikvp.Key, out _);
+                _items.TryRemove(ikvp.Key, out _);
         }
 
         /// <inheritdoc />
         public void ClearByRegex(string regex)
         {
             var compiled = new Regex(regex, RegexOptions.Compiled);
-            foreach (var ikvp in Items
+            foreach (var ikvp in _items
                 .Where(kvp => compiled.IsMatch(kvp.Key)))
-                Items.TryRemove(ikvp.Key, out _);
+                _items.TryRemove(ikvp.Key, out _);
         }
     }
 }
diff --git a/src/Umbraco.Core/Cache/FastDictionaryAppCacheBase.cs b/src/Umbraco.Abstractions/Cache/FastDictionaryAppCacheBase.cs
similarity index 96%
rename from src/Umbraco.Core/Cache/FastDictionaryAppCacheBase.cs
rename to src/Umbraco.Abstractions/Cache/FastDictionaryAppCacheBase.cs
index eb84423f32..57f4e7b9a2 100644
--- a/src/Umbraco.Core/Cache/FastDictionaryAppCacheBase.cs
+++ b/src/Umbraco.Abstractions/Cache/FastDictionaryAppCacheBase.cs
@@ -10,8 +10,15 @@ namespace Umbraco.Core.Cache
     /// <summary>
     /// Provides a base class to fast, dictionary-based <see cref="IAppCache"/> implementations.
     /// </summary>
-    internal abstract class FastDictionaryAppCacheBase : IAppCache
+    public abstract class FastDictionaryAppCacheBase : IAppCache
     {
+        private readonly ITypeFinder _typeFinder;
+
+        protected FastDictionaryAppCacheBase(ITypeFinder typeFinder)
+        {
+            _typeFinder = typeFinder ?? throw new ArgumentNullException(nameof(typeFinder));
+        }
+
         // prefix cache keys so we know which one are ours
         protected const string CacheItemPrefix = "umbrtmche";
 
@@ -116,7 +123,7 @@ namespace Umbraco.Core.Cache
         /// <inheritdoc />
         public virtual void ClearOfType(string typeName)
         {
-            var type = TypeFinder.GetTypeByName(typeName);
+            var type = _typeFinder.GetTypeByName(typeName);
             if (type == null) return;
             var isInterface = type.IsInterface;
             try
diff --git a/src/Umbraco.Core/Cache/HttpRequestAppCache.cs b/src/Umbraco.Abstractions/Cache/HttpRequestAppCache.cs
similarity index 61%
rename from src/Umbraco.Core/Cache/HttpRequestAppCache.cs
rename to src/Umbraco.Abstractions/Cache/HttpRequestAppCache.cs
index 018726538b..41c930ae86 100644
--- a/src/Umbraco.Core/Cache/HttpRequestAppCache.cs
+++ b/src/Umbraco.Abstractions/Cache/HttpRequestAppCache.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Web;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Core.Cache
 {
@@ -15,37 +16,29 @@ namespace Umbraco.Core.Cache
     /// or no Items...) then this cache acts as a pass-through and does not cache
     /// anything.</para>
     /// </remarks>
-    internal class HttpRequestAppCache : FastDictionaryAppCacheBase
+    public class HttpRequestAppCache : FastDictionaryAppCacheBase
     {
-        private readonly HttpContextBase _context;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="HttpRequestAppCache"/> class with a context, for unit tests!
         /// </summary>
-        public HttpRequestAppCache(HttpContextBase context)
+        public HttpRequestAppCache(Func<IDictionary> requestItems, ITypeFinder typeFinder) : base(typeFinder)
         {
-            _context = context;
+            ContextItems = requestItems;
         }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HttpRequestAppCache"/> class.
-        /// </summary>
-        /// <remarks>
-        /// <para>Will use HttpContext.Current.</para>
-        /// TODO: https://github.com/umbraco/Umbraco-CMS/issues/4239 - use IHttpContextAccessor NOT HttpContext.Current
-        /// </remarks>
-        public HttpRequestAppCache()
-        { }
+        private Func<IDictionary> ContextItems { get; }
 
-        private IDictionary ContextItems => _context?.Items ?? HttpContext.Current?.Items;
-
-        private bool HasContextItems => _context?.Items != null || HttpContext.Current != null;
+        private bool TryGetContextItems(out IDictionary items)
+        {
+            items = ContextItems?.Invoke();
+            return items != null;
+        }
 
         /// <inheritdoc />
         public override object Get(string key, Func<object> factory)
         {
             //no place to cache so just return the callback result
-            if (HasContextItems == false) return factory();
+            if (!TryGetContextItems(out var items)) return factory();
 
             key = GetCacheKey(key);
 
@@ -54,7 +47,7 @@ namespace Umbraco.Core.Cache
             try
             {
                 EnterWriteLock();
-                result = ContextItems[key] as Lazy<object>; // null if key not found
+                result = items[key] as Lazy<object>; // null if key not found
 
                 // cannot create value within the lock, so if result.IsValueCreated is false, just
                 // do nothing here - means that if creation throws, a race condition could cause
@@ -63,7 +56,7 @@ namespace Umbraco.Core.Cache
                 if (result == null || SafeLazy.GetSafeLazyValue(result, true) == null) // get non-created as NonCreatedValue & exceptions as null
                 {
                     result = SafeLazy.GetSafeLazy(factory);
-                    ContextItems[key] = result;
+                    items[key] = result;
                 }
             }
             finally
@@ -89,22 +82,22 @@ namespace Umbraco.Core.Cache
         {
             const string prefix = CacheItemPrefix + "-";
 
-            if (HasContextItems == false) return Enumerable.Empty<DictionaryEntry>();
+            if (!TryGetContextItems(out var items)) return Enumerable.Empty<DictionaryEntry>();
 
-            return ContextItems.Cast<DictionaryEntry>()
+            return items.Cast<DictionaryEntry>()
                 .Where(x => x.Key is string s && s.StartsWith(prefix));
         }
 
         protected override void RemoveEntry(string key)
         {
-            if (HasContextItems == false) return;
+            if (!TryGetContextItems(out var items)) return;
 
-            ContextItems.Remove(key);
+            items.Remove(key);
         }
 
         protected override object GetEntry(string key)
         {
-            return HasContextItems ? ContextItems[key] : null;
+            return !TryGetContextItems(out var items) ? null : items[key];
         }
 
         #endregion
@@ -117,26 +110,27 @@ namespace Umbraco.Core.Cache
 
         protected override void EnterWriteLock()
         {
-            if (HasContextItems)
-            {
-                // note: cannot keep 'entered' as a class variable here,
-                // since there is one per request - so storing it within
-                // ContextItems - which is locked, so this should be safe
+            if (!TryGetContextItems(out var items)) return;
 
-                var entered = false;
-                Monitor.Enter(ContextItems.SyncRoot, ref entered);
-                ContextItems[ContextItemsLockKey] = entered;
-            }
+            // note: cannot keep 'entered' as a class variable here,
+            // since there is one per request - so storing it within
+            // ContextItems - which is locked, so this should be safe
+
+            var entered = false;
+            Monitor.Enter(items.SyncRoot, ref entered);
+            items[ContextItemsLockKey] = entered;
         }
 
         protected override void ExitReadLock() => ExitWriteLock();
 
         protected override void ExitWriteLock()
         {
-            var entered = (bool?) ContextItems[ContextItemsLockKey] ?? false;
+            if (!TryGetContextItems(out var items)) return;
+
+            var entered = (bool?)items[ContextItemsLockKey] ?? false;
             if (entered)
-                Monitor.Exit(ContextItems.SyncRoot);
-            ContextItems.Remove(ContextItemsLockKey);
+                Monitor.Exit(items.SyncRoot);
+            items.Remove(ContextItemsLockKey);
         }
 
         #endregion
diff --git a/src/Umbraco.Core/Cache/ObjectCacheAppCache.cs b/src/Umbraco.Abstractions/Cache/ObjectCacheAppCache.cs
similarity index 97%
rename from src/Umbraco.Core/Cache/ObjectCacheAppCache.cs
rename to src/Umbraco.Abstractions/Cache/ObjectCacheAppCache.cs
index ad7f3d6bf7..208390276a 100644
--- a/src/Umbraco.Core/Cache/ObjectCacheAppCache.cs
+++ b/src/Umbraco.Abstractions/Cache/ObjectCacheAppCache.cs
@@ -13,13 +13,15 @@ namespace Umbraco.Core.Cache
     /// </summary>
     public class ObjectCacheAppCache : IAppPolicyCache
     {
+        private readonly ITypeFinder _typeFinder;
         private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ObjectCacheAppCache"/>.
         /// </summary>
-        public ObjectCacheAppCache()
+        public ObjectCacheAppCache(ITypeFinder typeFinder)
         {
+            _typeFinder = typeFinder ?? throw new ArgumentNullException(nameof(typeFinder));
             // the MemoryCache is created with name "in-memory". That name is
             // used to retrieve configuration options. It does not identify the memory cache, i.e.
             // each instance of this class has its own, independent, memory cache.
@@ -29,7 +31,7 @@ namespace Umbraco.Core.Cache
         /// <summary>
         /// Gets the internal memory cache, for tests only!
         /// </summary>
-        internal ObjectCache MemoryCache { get; private set; }
+        public ObjectCache MemoryCache { get; private set; }
 
         /// <inheritdoc />
         public object Get(string key)
@@ -178,7 +180,7 @@ namespace Umbraco.Core.Cache
         /// <inheritdoc />
         public virtual void ClearOfType(string typeName)
         {
-            var type = TypeFinder.GetTypeByName(typeName);
+            var type = _typeFinder.GetTypeByName(typeName);
             if (type == null) return;
             var isInterface = type.IsInterface;
             try
diff --git a/src/Umbraco.Abstractions/Composing/ITypeFinder.cs b/src/Umbraco.Abstractions/Composing/ITypeFinder.cs
new file mode 100644
index 0000000000..f302976dd6
--- /dev/null
+++ b/src/Umbraco.Abstractions/Composing/ITypeFinder.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace Umbraco.Core.Composing
+{
+    /// <summary>
+    /// Used to find objects by implemented types, names and/or attributes
+    /// </summary>
+    public interface ITypeFinder
+    {
+        Type GetTypeByName(string name);
+
+        /// <summary>
+        /// Return a list of found local Assemblies that Umbraco should scan for type finding
+        /// </summary>
+        /// <value></value>
+        IEnumerable<Assembly> AssembliesToScan { get; }
+
+        /// <summary>
+        /// Finds any classes derived from the assignTypeFrom Type that contain the attribute TAttribute
+        /// </summary>
+        /// <param name="assignTypeFrom"></param>
+        /// <param name="attributeType"></param>
+        /// <param name="assemblies"></param>
+        /// <param name="onlyConcreteClasses"></param>
+        /// <returns></returns>
+        IEnumerable<Type> FindClassesOfTypeWithAttribute(
+            Type assignTypeFrom,
+            Type attributeType,
+            IEnumerable<Assembly> assemblies = null,
+            bool onlyConcreteClasses = true);
+
+        /// <summary>
+        /// Returns all types found of in the assemblies specified of type T
+        /// </summary>
+        /// <param name="assignTypeFrom"></param>
+        /// <param name="assemblies"></param>
+        /// <param name="onlyConcreteClasses"></param>
+        /// <returns></returns>
+        IEnumerable<Type> FindClassesOfType(Type assignTypeFrom, IEnumerable<Assembly> assemblies = null, bool onlyConcreteClasses = true);
+
+        /// <summary>
+        /// Finds any classes with the attribute.
+        /// </summary>
+        /// <param name="attributeType">The attribute type </param>
+        /// <param name="assemblies">The assemblies.</param>
+        /// <param name="onlyConcreteClasses">if set to <c>true</c> only concrete classes.</param>
+        /// <returns></returns>
+        IEnumerable<Type> FindClassesWithAttribute(
+            Type attributeType,
+            IEnumerable<Assembly> assemblies,
+            bool onlyConcreteClasses);
+    }
+}
diff --git a/src/Umbraco.Core/Composing/TypeFinder.cs b/src/Umbraco.Abstractions/Composing/TypeFinder.cs
similarity index 58%
rename from src/Umbraco.Core/Composing/TypeFinder.cs
rename to src/Umbraco.Abstractions/Composing/TypeFinder.cs
index c07f3ae0f4..9d88153b0a 100644
--- a/src/Umbraco.Core/Composing/TypeFinder.cs
+++ b/src/Umbraco.Abstractions/Composing/TypeFinder.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Configuration;
 using System.IO;
@@ -6,98 +7,30 @@ using System.Linq;
 using System.Reflection;
 using System.Security;
 using System.Text;
-using System.Web;
-using System.Web.Compilation;
-using System.Web.Hosting;
-using Umbraco.Core.Composing;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Exceptions;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Composing
 {
-    /// <summary>
-    /// A utility class to find all classes of a certain type by reflection in the current bin folder
-    /// of the web application.
-    /// </summary>
-    public static class TypeFinder
+    /// <inheritdoc cref="ITypeFinder"/>
+    public class TypeFinder : ITypeFinder
     {
-        private static volatile HashSet<Assembly> _localFilteredAssemblyCache;
-        private static readonly object LocalFilteredAssemblyCacheLocker = new object();
-        private static readonly List<string> NotifiedLoadExceptionAssemblies = new List<string>();
-        private static string[] _assembliesAcceptingLoadExceptions;
+        private readonly ILogger _logger;
 
-        private static string[] AssembliesAcceptingLoadExceptions
+        public TypeFinder(ILogger logger, ITypeFinderConfig typeFinderConfig = null)
         {
-            get
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            _assembliesAcceptingLoadExceptions = typeFinderConfig?.AssembliesAcceptingLoadExceptions.Where(x => !x.IsNullOrWhiteSpace()).ToArray() ?? Array.Empty<string>();
+            _allAssemblies = new Lazy<HashSet<Assembly>>(() =>
             {
-                if (_assembliesAcceptingLoadExceptions != null)
-                    return _assembliesAcceptingLoadExceptions;
-
-                var s = ConfigurationManager.AppSettings[Constants.AppSettings.AssembliesAcceptingLoadExceptions];
-                return _assembliesAcceptingLoadExceptions = string.IsNullOrWhiteSpace(s)
-                    ? Array.Empty<string>()
-                    : s.Split(',').Select(x => x.Trim()).ToArray();
-            }
-        }
-
-        private static bool AcceptsLoadExceptions(Assembly a)
-        {
-            if (AssembliesAcceptingLoadExceptions.Length == 0)
-                return false;
-            if (AssembliesAcceptingLoadExceptions.Length == 1 && AssembliesAcceptingLoadExceptions[0] == "*")
-                return true;
-            var name = a.GetName().Name; // simple name of the assembly
-            return AssembliesAcceptingLoadExceptions.Any(pattern =>
-            {
-                if (pattern.Length > name.Length) return false; // pattern longer than name
-                if (pattern.Length == name.Length) return pattern.InvariantEquals(name); // same length, must be identical
-                if (pattern[pattern.Length] != '.') return false; // pattern is shorter than name, must end with dot
-                return name.StartsWith(pattern); // and name must start with pattern
-            });
-        }
-
-        /// <summary>
-        /// lazily load a reference to all assemblies and only local assemblies.
-        /// This is a modified version of: http://www.dominicpettifer.co.uk/Blog/44/how-to-get-a-reference-to-all-assemblies-in-the--bin-folder
-        /// </summary>
-        /// <remarks>
-        /// We do this because we cannot use AppDomain.Current.GetAssemblies() as this will return only assemblies that have been
-        /// loaded in the CLR, not all assemblies.
-        /// See these threads:
-        /// http://issues.umbraco.org/issue/U5-198
-        /// http://stackoverflow.com/questions/3552223/asp-net-appdomain-currentdomain-getassemblies-assemblies-missing-after-app
-        /// http://stackoverflow.com/questions/2477787/difference-between-appdomain-getassemblies-and-buildmanager-getreferencedassembl
-        /// </remarks>
-        internal static HashSet<Assembly> GetAllAssemblies()
-        {
-            return AllAssemblies.Value;
-        }
-
-        //Lazy access to the all assemblies list
-        private static readonly Lazy<HashSet<Assembly>> AllAssemblies = new Lazy<HashSet<Assembly>>(() =>
-        {
-            HashSet<Assembly> assemblies = null;
-            try
-            {
-                var isHosted = Current.IOHelper.IsHosted;
-
+                HashSet<Assembly> assemblies = null;
                 try
-                {
-                    if (isHosted)
-                    {
-                        assemblies = new HashSet<Assembly>(BuildManager.GetReferencedAssemblies().Cast<Assembly>());
-                    }
-                }
-                catch (InvalidOperationException e)
-                {
-                    if (e.InnerException is SecurityException == false)
-                        throw;
-                }
-
-                if (assemblies == null)
                 {
                     //NOTE: we cannot use AppDomain.CurrentDomain.GetAssemblies() because this only returns assemblies that have
                     // already been loaded in to the app domain, instead we will look directly into the bin folder and load each one.
-                    var binFolder = Current.IOHelper.GetRootDirectoryBinFolder();
+                    var binFolder = GetRootDirectorySafe();
                     var binAssemblyFiles = Directory.GetFiles(binFolder, "*.dll", SearchOption.TopDirectoryOnly).ToList();
                     //var binFolder = Assembly.GetExecutingAssembly().GetAssemblyFile().Directory;
                     //var binAssemblyFiles = Directory.GetFiles(binFolder.FullName, "*.dll", SearchOption.TopDirectoryOnly).ToList();
@@ -122,63 +55,101 @@ namespace Umbraco.Core.Composing
                             }
                         }
                     }
-                }
 
-                //if for some reason they are still no assemblies, then use the AppDomain to load in already loaded assemblies.
-                if (assemblies.Any() == false)
-                {
+                    //Since we are only loading in the /bin assemblies above, we will also load in anything that's already loaded (which will include gac items)
                     foreach (var a in AppDomain.CurrentDomain.GetAssemblies())
                     {
                         assemblies.Add(a);
                     }
                 }
-
-                //here we are trying to get the App_Code assembly
-                var fileExtensions = new[] { ".cs", ".vb" }; //only vb and cs files are supported
-                var appCodeFolder = new DirectoryInfo(Current.IOHelper.MapPath(Current.IOHelper.ResolveUrl("~/App_code")));
-                //check if the folder exists and if there are any files in it with the supported file extensions
-                if (appCodeFolder.Exists && fileExtensions.Any(x => appCodeFolder.GetFiles("*" + x).Any()))
+                catch (InvalidOperationException e)
                 {
-                    try
-                    {
-                        var appCodeAssembly = Assembly.Load("App_Code");
-                        if (assemblies.Contains(appCodeAssembly) == false) // BuildManager will find App_Code already
-                            assemblies.Add(appCodeAssembly);
-                    }
-                    catch (FileNotFoundException ex)
-                    {
-                        //this will occur if it cannot load the assembly
-                        Current.Logger.Error(typeof(TypeFinder), ex, "Could not load assembly App_Code");
-                    }
+                    if (e.InnerException is SecurityException == false)
+                        throw;
                 }
-            }
-            catch (InvalidOperationException e)
+
+                return assemblies;
+            });
+        }
+
+        //Lazy access to the all assemblies list
+        private readonly Lazy<HashSet<Assembly>> _allAssemblies;
+        private volatile HashSet<Assembly> _localFilteredAssemblyCache;
+        private readonly object _localFilteredAssemblyCacheLocker = new object();
+        private readonly List<string> _notifiedLoadExceptionAssemblies = new List<string>();
+        private static readonly ConcurrentDictionary<string, Type> TypeNamesCache= new ConcurrentDictionary<string, Type>();
+        private string _rootDir = "";
+        private readonly string[] _assembliesAcceptingLoadExceptions;
+
+        // FIXME - this is only an interim change, once the IIOHelper stuff is merged we should use IIOHelper here
+        private string GetRootDirectorySafe()
+        {
+            if (string.IsNullOrEmpty(_rootDir) == false)
             {
-                if (e.InnerException is SecurityException == false)
-                    throw;
+                return _rootDir;
             }
 
-            return assemblies;
-        });
+            var codeBase = Assembly.GetExecutingAssembly().CodeBase;
+            var uri = new Uri(codeBase);
+            var path = uri.LocalPath;
+            var baseDirectory = Path.GetDirectoryName(path);
+            if (string.IsNullOrEmpty(baseDirectory))
+                throw new PanicException("No root directory could be resolved.");
+
+            _rootDir = baseDirectory.Contains("bin")
+                ? baseDirectory.Substring(0, baseDirectory.LastIndexOf("bin", StringComparison.OrdinalIgnoreCase) - 1)
+                : baseDirectory;
+
+            return _rootDir;
+        }
+
+        private bool AcceptsLoadExceptions(Assembly a)
+        {
+            if (_assembliesAcceptingLoadExceptions.Length == 0)
+                return false;
+            if (_assembliesAcceptingLoadExceptions.Length == 1 && _assembliesAcceptingLoadExceptions[0] == "*")
+                return true;
+            var name = a.GetName().Name; // simple name of the assembly
+            return _assembliesAcceptingLoadExceptions.Any(pattern =>
+            {
+                if (pattern.Length > name.Length) return false; // pattern longer than name
+                if (pattern.Length == name.Length) return pattern.InvariantEquals(name); // same length, must be identical
+                if (pattern[pattern.Length] != '.') return false; // pattern is shorter than name, must end with dot
+                return name.StartsWith(pattern); // and name must start with pattern
+            });
+        }
 
         /// <summary>
-        /// Return a list of found local Assemblies excluding the known assemblies we don't want to scan
-        /// and excluding the ones passed in and excluding the exclusion list filter, the results of this are
-        /// cached for performance reasons.
+        /// lazily load a reference to all assemblies and only local assemblies.
+        /// This is a modified version of: http://www.dominicpettifer.co.uk/Blog/44/how-to-get-a-reference-to-all-assemblies-in-the--bin-folder
         /// </summary>
-        /// <param name="excludeFromResults"></param>
-        /// <returns></returns>
-        internal static HashSet<Assembly> GetAssembliesWithKnownExclusions(
-            IEnumerable<Assembly> excludeFromResults = null)
+        /// <remarks>
+        /// We do this because we cannot use AppDomain.Current.GetAssemblies() as this will return only assemblies that have been
+        /// loaded in the CLR, not all assemblies.
+        /// See these threads:
+        /// http://issues.umbraco.org/issue/U5-198
+        /// http://stackoverflow.com/questions/3552223/asp-net-appdomain-currentdomain-getassemblies-assemblies-missing-after-app
+        /// http://stackoverflow.com/questions/2477787/difference-between-appdomain-getassemblies-and-buildmanager-getreferencedassembl
+        /// </remarks>
+        private IEnumerable<Assembly> GetAllAssemblies()
         {
-            lock (LocalFilteredAssemblyCacheLocker)
-            {
-                if (_localFilteredAssemblyCache != null)
-                    return _localFilteredAssemblyCache;
+            return _allAssemblies.Value;
+        }
 
-                var assemblies = GetFilteredAssemblies(excludeFromResults, KnownAssemblyExclusionFilter);
-                _localFilteredAssemblyCache = new HashSet<Assembly>(assemblies);
-                return _localFilteredAssemblyCache;
+        /// <inheritdoc />
+        public IEnumerable<Assembly> AssembliesToScan
+        {
+            get
+            {
+                lock (_localFilteredAssemblyCacheLocker)
+                {
+                    if (_localFilteredAssemblyCache != null)
+                        return _localFilteredAssemblyCache;
+
+                    var assemblies = GetFilteredAssemblies(null, KnownAssemblyExclusionFilter);
+                    _localFilteredAssemblyCache = new HashSet<Assembly>(assemblies);
+                    return _localFilteredAssemblyCache;
+                }
             }
         }
 
@@ -188,7 +159,7 @@ namespace Umbraco.Core.Composing
         /// <param name="excludeFromResults"></param>
         /// <param name="exclusionFilter"></param>
         /// <returns></returns>
-        private static IEnumerable<Assembly> GetFilteredAssemblies(
+        private IEnumerable<Assembly> GetFilteredAssemblies(
             IEnumerable<Assembly> excludeFromResults = null,
             string[] exclusionFilter = null)
         {
@@ -210,7 +181,7 @@ namespace Umbraco.Core.Composing
         /// NOTE the comma vs period... comma delimits the name in an Assembly FullName property so if it ends with comma then its an exact name match
         /// NOTE this means that "foo." will NOT exclude "foo.dll" but only "foo.*.dll"
         /// </remarks>
-        internal static readonly string[] KnownAssemblyExclusionFilter = {
+        private static readonly string[] KnownAssemblyExclusionFilter = {
             "Antlr3.",
             "AutoMapper,",
             "AutoMapper.",
@@ -261,115 +232,40 @@ namespace Umbraco.Core.Composing
         };
 
         /// <summary>
-        /// Finds any classes derived from the type T that contain the attribute TAttribute
+        /// Finds any classes derived from the assignTypeFrom Type that contain the attribute TAttribute
         /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <typeparam name="TAttribute"></typeparam>
-        /// <returns></returns>
-        public static IEnumerable<Type> FindClassesOfTypeWithAttribute<T, TAttribute>()
-            where TAttribute : Attribute
-        {
-            return FindClassesOfTypeWithAttribute<T, TAttribute>(GetAssembliesWithKnownExclusions(), true);
-        }
-
-        /// <summary>
-        /// Finds any classes derived from the type T that contain the attribute TAttribute
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <typeparam name="TAttribute"></typeparam>
-        /// <param name="assemblies"></param>
-        /// <returns></returns>
-        public static IEnumerable<Type> FindClassesOfTypeWithAttribute<T, TAttribute>(IEnumerable<Assembly> assemblies)
-            where TAttribute : Attribute
-        {
-            return FindClassesOfTypeWithAttribute<T, TAttribute>(assemblies, true);
-        }
-
-        /// <summary>
-        /// Finds any classes derived from the type T that contain the attribute TAttribute
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <typeparam name="TAttribute"></typeparam>
+        /// <param name="assignTypeFrom"></param>
+        /// <param name="attributeType"></param>
         /// <param name="assemblies"></param>
         /// <param name="onlyConcreteClasses"></param>
         /// <returns></returns>
-        public static IEnumerable<Type> FindClassesOfTypeWithAttribute<T, TAttribute>(
-            IEnumerable<Assembly> assemblies,
-            bool onlyConcreteClasses)
-            where TAttribute : Attribute
+        public IEnumerable<Type> FindClassesOfTypeWithAttribute(
+            Type assignTypeFrom,
+            Type attributeType,
+            IEnumerable<Assembly> assemblies = null,
+            bool onlyConcreteClasses = true)
         {
-            return FindClassesOfTypeWithAttribute<TAttribute>(typeof(T), assemblies, onlyConcreteClasses);
+            var assemblyList = (assemblies ?? AssembliesToScan).ToList();
+
+            return GetClassesWithBaseType(assignTypeFrom, assemblyList, onlyConcreteClasses,
+                //the additional filter will ensure that any found types also have the attribute applied.
+                t => t.GetCustomAttributes(attributeType, false).Any());
         }
 
         /// <summary>
-        /// Finds any classes derived from the assignTypeFrom Type that contain the attribute TAttribute
+        /// Returns all types found of in the assemblies specified of type T
         /// </summary>
-        /// <typeparam name="TAttribute"></typeparam>
         /// <param name="assignTypeFrom"></param>
         /// <param name="assemblies"></param>
         /// <param name="onlyConcreteClasses"></param>
         /// <returns></returns>
-        public static IEnumerable<Type> FindClassesOfTypeWithAttribute<TAttribute>(
-            Type assignTypeFrom,
-            IEnumerable<Assembly> assemblies,
-            bool onlyConcreteClasses)
-            where TAttribute : Attribute
+        public IEnumerable<Type> FindClassesOfType(Type assignTypeFrom, IEnumerable<Assembly> assemblies = null, bool onlyConcreteClasses = true)
         {
-            if (assemblies == null) throw new ArgumentNullException(nameof(assemblies));
+            var assemblyList = (assemblies ?? AssembliesToScan).ToList();
 
-            return GetClassesWithBaseType(assignTypeFrom, assemblies, onlyConcreteClasses,
-                //the additional filter will ensure that any found types also have the attribute applied.
-                t => t.GetCustomAttributes<TAttribute>(false).Any());
+            return GetClassesWithBaseType(assignTypeFrom, assemblyList, onlyConcreteClasses);
         }
-
-        /// <summary>
-        /// Searches all filtered local assemblies specified for classes of the type passed in.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
-        public static IEnumerable<Type> FindClassesOfType<T>()
-        {
-            return FindClassesOfType<T>(GetAssembliesWithKnownExclusions(), true);
-        }
-
-        /// <summary>
-        /// Returns all types found of in the assemblies specified of type T
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="assemblies"></param>
-        /// <param name="onlyConcreteClasses"></param>
-        /// <returns></returns>
-        public static IEnumerable<Type> FindClassesOfType<T>(IEnumerable<Assembly> assemblies, bool onlyConcreteClasses)
-        {
-            if (assemblies == null) throw new ArgumentNullException(nameof(assemblies));
-
-            return GetClassesWithBaseType(typeof(T), assemblies, onlyConcreteClasses);
-        }
-
-        /// <summary>
-        /// Returns all types found of in the assemblies specified of type T
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="assemblies"></param>
-        /// <returns></returns>
-        public static IEnumerable<Type> FindClassesOfType<T>(IEnumerable<Assembly> assemblies)
-        {
-            return FindClassesOfType<T>(assemblies, true);
-        }
-
-        /// <summary>
-        /// Finds the classes with attribute.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="assemblies">The assemblies.</param>
-        /// <param name="onlyConcreteClasses">if set to <c>true</c> only concrete classes.</param>
-        /// <returns></returns>
-        public static IEnumerable<Type> FindClassesWithAttribute<T>(IEnumerable<Assembly> assemblies, bool onlyConcreteClasses)
-            where T : Attribute
-        {
-            return FindClassesWithAttribute(typeof(T), assemblies, onlyConcreteClasses);
-        }
-
+        
         /// <summary>
         /// Finds any classes with the attribute.
         /// </summary>
@@ -377,40 +273,58 @@ namespace Umbraco.Core.Composing
         /// <param name="assemblies">The assemblies.</param>
         /// <param name="onlyConcreteClasses">if set to <c>true</c> only concrete classes.</param>
         /// <returns></returns>
-        public static IEnumerable<Type> FindClassesWithAttribute(
+        public IEnumerable<Type> FindClassesWithAttribute(
             Type attributeType,
-            IEnumerable<Assembly> assemblies,
-            bool onlyConcreteClasses)
+            IEnumerable<Assembly> assemblies = null,
+            bool onlyConcreteClasses = true)
         {
-            return GetClassesWithAttribute(attributeType, assemblies, onlyConcreteClasses);
+            var assemblyList = (assemblies ?? AssembliesToScan).ToList();
+
+            return GetClassesWithAttribute(attributeType, assemblyList, onlyConcreteClasses);
         }
 
         /// <summary>
-        /// Finds the classes with attribute.
+        /// Returns a Type for the string type name
         /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="assemblies">The assemblies.</param>
+        /// <param name="name"></param>
         /// <returns></returns>
-        public static IEnumerable<Type> FindClassesWithAttribute<T>(IEnumerable<Assembly> assemblies)
-            where T : Attribute
+        public virtual Type GetTypeByName(string name)
         {
-            return FindClassesWithAttribute<T>(assemblies, true);
-        }
+            // This is exactly what the BuildManager does, if the type is an assembly qualified type
+            // name it will find it.
+            if (TypeNameContainsAssembly(name))
+            {
+                return Type.GetType(name);
+            }
 
-        /// <summary>
-        /// Finds the classes with attribute in filtered local assemblies
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
-        public static IEnumerable<Type> FindClassesWithAttribute<T>()
-            where T : Attribute
-        {
-            return FindClassesWithAttribute<T>(GetAssembliesWithKnownExclusions());
+            // It didn't parse, so try loading from each already loaded assembly and cache it
+            return TypeNamesCache.GetOrAdd(name, s =>
+                AppDomain.CurrentDomain.GetAssemblies()
+                    .Select(x => x.GetType(s))
+                    .FirstOrDefault(x => x != null));
         }
 
         #region Private methods
 
-        private static IEnumerable<Type> GetClassesWithAttribute(
+        // borrowed from aspnet System.Web.UI.Util
+        private static bool TypeNameContainsAssembly(string typeName)
+        {
+            return CommaIndexInTypeName(typeName) > 0;
+        }
+
+        // borrowed from aspnet System.Web.UI.Util
+        private static int CommaIndexInTypeName(string typeName)
+        {
+            var num1 = typeName.LastIndexOf(',');
+            if (num1 < 0)
+                return -1;
+            var num2 = typeName.LastIndexOf(']');
+            if (num2 > num1)
+                return -1;
+            return typeName.IndexOf(',', num2 + 1);
+        }
+
+        private IEnumerable<Type> GetClassesWithAttribute(
             Type attributeType,
             IEnumerable<Assembly> assemblies,
             bool onlyConcreteClasses)
@@ -441,7 +355,7 @@ namespace Umbraco.Core.Composing
                     }
                     catch (TypeLoadException ex)
                     {
-                        Current.Logger.Error(typeof(TypeFinder), ex, "Could not query types on {Assembly} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", assembly);
+                        _logger.Error(typeof(TypeFinder), ex, "Could not query types on {Assembly} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", assembly);
                         continue;
                     }
 
@@ -477,7 +391,7 @@ namespace Umbraco.Core.Composing
         /// <param name="onlyConcreteClasses"></param>
         /// <param name="additionalFilter">An additional filter to apply for what types will actually be included in the return value</param>
         /// <returns></returns>
-        private static IEnumerable<Type> GetClassesWithBaseType(
+        private IEnumerable<Type> GetClassesWithBaseType(
             Type baseType,
             IEnumerable<Assembly> assemblies,
             bool onlyConcreteClasses,
@@ -507,7 +421,7 @@ namespace Umbraco.Core.Composing
                     }
                     catch (TypeLoadException ex)
                     {
-                        Current.Logger.Error(typeof(TypeFinder), ex, "Could not query types on {Assembly} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", assembly);
+                        _logger.Error(typeof(TypeFinder), ex, "Could not query types on {Assembly} assembly, this is most likely due to this assembly not being compatible with the current Umbraco version", assembly);
                         continue;
                     }
 
@@ -533,7 +447,7 @@ namespace Umbraco.Core.Composing
             return types;
         }
 
-        internal static IEnumerable<Type> GetTypesWithFormattedException(Assembly a)
+        private IEnumerable<Type> GetTypesWithFormattedException(Assembly a)
         {
             //if the assembly is dynamic, do not try to scan it
             if (a.IsDynamic)
@@ -569,12 +483,12 @@ namespace Umbraco.Core.Composing
                 if (AcceptsLoadExceptions(a) == false) throw ex;
 
                 // log a warning, and return what we can
-                lock (NotifiedLoadExceptionAssemblies)
+                lock (_notifiedLoadExceptionAssemblies)
                 {
-                    if (NotifiedLoadExceptionAssemblies.Contains(a.FullName) == false)
+                    if (_notifiedLoadExceptionAssemblies.Contains(a.FullName) == false)
                     {
-                        NotifiedLoadExceptionAssemblies.Add(a.FullName);
-                        Current.Logger.Warn(typeof (TypeFinder), ex, "Could not load all types from {TypeName}.", a.GetName().Name);
+                        _notifiedLoadExceptionAssemblies.Add(a.FullName);
+                        _logger.Warn(typeof (TypeFinder), ex, "Could not load all types from {TypeName}.", a.GetName().Name);
                     }
                 }
                 return rex.Types.WhereNotNull().ToArray();
@@ -595,8 +509,7 @@ namespace Umbraco.Core.Composing
             sb.Append(". ");
             sb.Append(loaderException.GetType().FullName);
 
-            var tloadex = loaderException as TypeLoadException;
-            if (tloadex != null)
+            if (loaderException is TypeLoadException tloadex)
             {
                 sb.Append(" on ");
                 sb.Append(tloadex.TypeName);
@@ -609,24 +522,6 @@ namespace Umbraco.Core.Composing
 
         #endregion
 
-        public static Type GetTypeByName(string typeName)
-        {
-            var type = BuildManager.GetType(typeName, false);
-            if (type != null) return type;
 
-            // TODO: This isn't very elegant, and will have issues since the AppDomain.CurrentDomain
-            // doesn't actualy load in all assemblies, only the types that have been referenced so far.
-            // However, in a web context, the BuildManager will have executed which will force all assemblies
-            // to be loaded so it's fine for now.
-            // It could be fairly easy to parse the typeName to get the assembly name and then do Assembly.Load and
-            // find the type from there.
-
-            //now try fall back procedures.
-            type = Type.GetType(typeName);
-            if (type != null) return type;
-            return AppDomain.CurrentDomain.GetAssemblies()
-                .Select(x => x.GetType(typeName))
-                .FirstOrDefault(x => x != null);
-        }
     }
 }
diff --git a/src/Umbraco.Abstractions/Composing/TypeFinderExtensions.cs b/src/Umbraco.Abstractions/Composing/TypeFinderExtensions.cs
new file mode 100644
index 0000000000..e364790556
--- /dev/null
+++ b/src/Umbraco.Abstractions/Composing/TypeFinderExtensions.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace Umbraco.Core.Composing
+{
+    public static class TypeFinderExtensions
+    {
+        /// <summary>
+        /// Finds any classes derived from the type T that contain the attribute TAttribute
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <typeparam name="TAttribute"></typeparam>
+        /// <param name="typeFinder"></param>
+        /// <param name="assemblies"></param>
+        /// <param name="onlyConcreteClasses"></param>
+        /// <returns></returns>
+        public static IEnumerable<Type> FindClassesOfTypeWithAttribute<T, TAttribute>(this ITypeFinder typeFinder, IEnumerable<Assembly> assemblies = null, bool onlyConcreteClasses = true)
+            where TAttribute : Attribute
+            => typeFinder.FindClassesOfTypeWithAttribute(typeof(T), typeof(TAttribute), assemblies, onlyConcreteClasses);
+
+        /// <summary>
+        /// Returns all types found of in the assemblies specified of type T
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="typeFinder"></param>
+        /// <param name="assemblies"></param>
+        /// <param name="onlyConcreteClasses"></param>
+        /// <returns></returns>
+        public static IEnumerable<Type> FindClassesOfType<T>(this ITypeFinder typeFinder, IEnumerable<Assembly> assemblies = null, bool onlyConcreteClasses = true)
+            => typeFinder.FindClassesOfType(typeof(T), assemblies, onlyConcreteClasses);
+
+        /// <summary>
+        /// Finds the classes with attribute.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="typeFinder"></param>
+        /// <param name="assemblies">The assemblies.</param>
+        /// <param name="onlyConcreteClasses">if set to <c>true</c> only concrete classes.</param>
+        /// <returns></returns>
+        public static IEnumerable<Type> FindClassesWithAttribute<T>(this ITypeFinder typeFinder, IEnumerable<Assembly> assemblies = null, bool onlyConcreteClasses = true)
+            where T : Attribute
+            => typeFinder.FindClassesWithAttribute(typeof(T), assemblies, onlyConcreteClasses);
+    }
+}
diff --git a/src/Umbraco.Abstractions/Composing/TypeHelper.cs b/src/Umbraco.Abstractions/Composing/TypeHelper.cs
index 40a1adc118..28eab6a5ec 100644
--- a/src/Umbraco.Abstractions/Composing/TypeHelper.cs
+++ b/src/Umbraco.Abstractions/Composing/TypeHelper.cs
@@ -8,6 +8,7 @@ using System.Reflection;
 
 namespace Umbraco.Core.Composing
 {
+    
     /// <summary>
     /// A utility class for type checking, this provides internal caching so that calls to these methods will be faster
     /// than doing a manual type check in c#
@@ -18,9 +19,11 @@ namespace Umbraco.Core.Composing
             = new ConcurrentDictionary<Tuple<Type, bool, bool, bool>, PropertyInfo[]>();
         private static readonly ConcurrentDictionary<Type, FieldInfo[]> GetFieldsCache
             = new ConcurrentDictionary<Type, FieldInfo[]>();
-
+        
         private static readonly Assembly[] EmptyAssemblies  = new Assembly[0];
 
+        
+
         /// <summary>
         /// Based on a type we'll check if it is IEnumerable{T} (or similar) and if so we'll return a List{T}, this will also deal with array types and return List{T} for those too.
         /// If it cannot be done, null is returned.
diff --git a/src/Umbraco.Core/Composing/TypeLoader.cs b/src/Umbraco.Abstractions/Composing/TypeLoader.cs
similarity index 91%
rename from src/Umbraco.Core/Composing/TypeLoader.cs
rename to src/Umbraco.Abstractions/Composing/TypeLoader.cs
index d2dffb8ffc..d2f203e112 100644
--- a/src/Umbraco.Core/Composing/TypeLoader.cs
+++ b/src/Umbraco.Abstractions/Composing/TypeLoader.cs
@@ -5,30 +5,30 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading;
-using System.Web;
-using System.Web.Compilation;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Collections;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using File = System.IO.File;
 
 namespace Umbraco.Core.Composing
 {
+    
+
     /// <summary>
     /// Provides methods to find and instantiate types.
     /// </summary>
     /// <remarks>
-    /// <para>This class should be used to get all types, the <see cref="TypeFinder"/> class should never be used directly.</para>
+    /// <para>This class should be used to get all types, the <see cref="ITypeFinder"/> class should never be used directly.</para>
     /// <para>In most cases this class is not used directly but through extension methods that retrieve specific types.</para>
     /// <para>This class caches the types it knows to avoid excessive assembly scanning and shorten startup times, relying
     /// on a hash of the DLLs in the ~/bin folder to check for cache expiration.</para>
     /// </remarks>
-    public class TypeLoader
+    public sealed class TypeLoader
     {
         private const string CacheKey = "umbraco-types.list";
 
+        private readonly IIOHelper _ioHelper;
         private readonly IAppPolicyCache _runtimeCache;
         private readonly IProfilingLogger _logger;
 
@@ -42,31 +42,40 @@ namespace Umbraco.Core.Composing
         private string _currentAssembliesHash;
         private IEnumerable<Assembly> _assemblies;
         private bool _reportedChange;
-        private readonly string _localTempPath;
+        private readonly DirectoryInfo _localTempPath;
         private string _fileBasePath;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="TypeLoader"/> class.
         /// </summary>
+        /// <param name="ioHelper"></param>
+        /// <param name="typeFinder"></param>
         /// <param name="runtimeCache">The application runtime cache.</param>
         /// <param name="localTempPath">Files storage location.</param>
         /// <param name="logger">A profiling logger.</param>
-        public TypeLoader(IAppPolicyCache runtimeCache, string localTempPath, IProfilingLogger logger)
-            : this(runtimeCache, localTempPath, logger, true)
+        /// <param name="assembliesToScan"></param>
+        public TypeLoader(IIOHelper ioHelper, ITypeFinder typeFinder, IAppPolicyCache runtimeCache, DirectoryInfo localTempPath, IProfilingLogger logger, IEnumerable<Assembly> assembliesToScan = null)
+            : this(ioHelper, typeFinder, runtimeCache, localTempPath, logger, true, assembliesToScan)
         { }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="TypeLoader"/> class.
         /// </summary>
+        /// <param name="ioHelper"></param>
+        /// <param name="typeFinder"></param>
         /// <param name="runtimeCache">The application runtime cache.</param>
         /// <param name="localTempPath">Files storage location.</param>
         /// <param name="logger">A profiling logger.</param>
         /// <param name="detectChanges">Whether to detect changes using hashes.</param>
-        internal TypeLoader(IAppPolicyCache runtimeCache, string localTempPath, IProfilingLogger logger, bool detectChanges)
+        /// <param name="assembliesToScan"></param>
+        public TypeLoader(IIOHelper ioHelper, ITypeFinder typeFinder, IAppPolicyCache runtimeCache, DirectoryInfo localTempPath, IProfilingLogger logger, bool detectChanges, IEnumerable<Assembly> assembliesToScan = null)
         {
+            TypeFinder = typeFinder ?? throw new ArgumentNullException(nameof(typeFinder));
+            _ioHelper = ioHelper;
             _runtimeCache = runtimeCache ?? throw new ArgumentNullException(nameof(runtimeCache));
             _localTempPath = localTempPath;
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            _assemblies = assembliesToScan;
 
             if (detectChanges)
             {
@@ -99,11 +108,10 @@ namespace Umbraco.Core.Composing
         }
 
         /// <summary>
-        /// Initializes a new, test/blank, instance of the <see cref="TypeLoader"/> class.
+        /// Returns the underlying <see cref="ITypeFinder"/>
         /// </summary>
-        /// <remarks>The initialized instance cannot get types.</remarks>
-        internal TypeLoader()
-        { }
+        // ReSharper disable once MemberCanBePrivate.Global
+        public ITypeFinder TypeFinder { get; }
 
         /// <summary>
         /// Gets or sets the set of assemblies to scan.
@@ -115,25 +123,21 @@ namespace Umbraco.Core.Composing
         /// <para>This is for unit tests.</para>
         /// </remarks>
         // internal for tests
-        internal IEnumerable<Assembly> AssembliesToScan
-        {
-            get => _assemblies ?? (_assemblies = TypeFinder.GetAssembliesWithKnownExclusions());
-            set => _assemblies = value;
-        }
+        public IEnumerable<Assembly> AssembliesToScan => _assemblies ?? (_assemblies = TypeFinder.AssembliesToScan);
 
         /// <summary>
         /// Gets the type lists.
         /// </summary>
         /// <remarks>For unit tests.</remarks>
         // internal for tests
-        internal IEnumerable<TypeList> TypeLists => _types.Values;
+        public IEnumerable<TypeList> TypeLists => _types.Values;
 
         /// <summary>
         /// Sets a type list.
         /// </summary>
         /// <remarks>For unit tests.</remarks>
         // internal for tests
-        internal void AddTypeList(TypeList typeList)
+        public void AddTypeList(TypeList typeList)
         {
             var tobject = typeof(object); // CompositeTypeTypeKey does not support null values
             _types[new CompositeTypeTypeKey(typeList.BaseType ?? tobject, typeList.AttributeType ?? tobject)] = typeList;
@@ -180,12 +184,16 @@ namespace Umbraco.Core.Composing
 
                 _currentAssembliesHash = GetFileHash(new List<Tuple<FileSystemInfo, bool>>
                     {
+                        // TODO: Would be nicer to abstract this logic out into IAssemblyHash
+
+                        // TODO: Use constants from SystemDirectories when we can (once it's ported to netstandard lib)
+
                         // the bin folder and everything in it
-                        new Tuple<FileSystemInfo, bool>(new DirectoryInfo(Current.IOHelper.MapPath(SystemDirectories.Bin)), false),
+                        new Tuple<FileSystemInfo, bool>(new DirectoryInfo(_ioHelper.MapPath("~/bin")), false),
                         // the app code folder and everything in it
-                        new Tuple<FileSystemInfo, bool>(new DirectoryInfo(Current.IOHelper.MapPath("~/App_Code")), false),
+                        new Tuple<FileSystemInfo, bool>(new DirectoryInfo(_ioHelper.MapPath("~/App_Code")), false),
                         // global.asax (the app domain also monitors this, if it changes will do a full restart)
-                        new Tuple<FileSystemInfo, bool>(new FileInfo(Current.IOHelper.MapPath("~/global.asax")), false)
+                        new Tuple<FileSystemInfo, bool>(new FileInfo(_ioHelper.MapPath("~/global.asax")), false)
                     }, _logger);
 
                 return _currentAssembliesHash;
@@ -267,7 +275,7 @@ namespace Umbraco.Core.Composing
         /// <param name="logger">A profiling logger.</param>
         /// <returns>The hash.</returns>
         // internal for tests
-        internal static string GetFileHash(IEnumerable<FileSystemInfo> filesAndFolders, IProfilingLogger logger)
+        public static string GetFileHash(IEnumerable<FileSystemInfo> filesAndFolders, IProfilingLogger logger)
         {
             using (logger.DebugDuration<TypeLoader>("Determining hash of code files on disk", "Hash determined"))
             {
@@ -298,7 +306,7 @@ namespace Umbraco.Core.Composing
         private const int FileDeleteTimeout = 4000; // milliseconds
 
         // internal for tests
-        internal Attempt<IEnumerable<string>> TryGetCached(Type baseType, Type attributeType)
+        public Attempt<IEnumerable<string>> TryGetCached(Type baseType, Type attributeType)
         {
             var cache = _runtimeCache.GetCacheItem<Dictionary<Tuple<string, string>, IEnumerable<string>>>(CacheKey, ReadCacheSafe, TimeSpan.FromSeconds(ListFileCacheDuration));
 
@@ -331,7 +339,7 @@ namespace Umbraco.Core.Composing
         }
 
         // internal for tests
-        internal Dictionary<Tuple<string, string>, IEnumerable<string>> ReadCache()
+        public Dictionary<Tuple<string, string>, IEnumerable<string>> ReadCache()
         {
             var cache = new Dictionary<Tuple<string, string>, IEnumerable<string>>();
 
@@ -377,7 +385,7 @@ namespace Umbraco.Core.Composing
         }
 
         // internal for tests
-        internal string GetTypesListFilePath() => GetFileBasePath() + ".list";
+        public string GetTypesListFilePath() => GetFileBasePath() + ".list";
 
         private string GetTypesHashFilePath() => GetFileBasePath() + ".hash";
 
@@ -388,7 +396,7 @@ namespace Umbraco.Core.Composing
                 if (_fileBasePath != null)
                     return _fileBasePath;
 
-                _fileBasePath = Path.Combine(_localTempPath, "TypesCache", "umbraco-types." + NetworkHelper.FileSafeMachineName);
+                _fileBasePath = Path.Combine(_localTempPath.FullName, "TypesCache", "umbraco-types." + NetworkHelper.FileSafeMachineName);
 
                 // ensure that the folder exists
                 var directory = Path.GetDirectoryName(_fileBasePath);
@@ -402,7 +410,7 @@ namespace Umbraco.Core.Composing
         }
 
         // internal for tests
-        internal void WriteCache()
+        public void WriteCache()
         {
             _logger.Debug<TypeLoader>("Writing cache file.");
             var typesListFilePath = GetTypesListFilePath();
@@ -720,18 +728,13 @@ namespace Umbraco.Core.Composing
                     // successfully retrieved types from the file cache: load
                     foreach (var type in cacheResult.Result)
                     {
-                        try
-                        {
-                            // we use the build manager to ensure we get all types loaded, this is slightly slower than
-                            // Type.GetType but if the types in the assembly aren't loaded yet it would fail whereas
-                            // BuildManager will load them - this is how eg MVC loads types, etc - no need to make it
-                            // more complicated
-                            typeList.Add(BuildManager.GetType(type, true));
-                        }
-                        catch (Exception ex)
+                        var resolvedType = TypeFinder.GetTypeByName(type);
+                        if (resolvedType != null)
+                            typeList.Add(resolvedType);
+                        else
                         {
                             // in case of any exception, we have to exit, and revert to scanning
-                            _logger.Error<TypeLoader>(ex, "Getting {TypeName}: failed to load cache file type {CacheType}, reverting to scanning assemblies.", GetName(baseType, attributeType), type);
+                            _logger.Warn<TypeLoader>("Getting {TypeName}: failed to load cache file type {CacheType}, reverting to scanning assemblies.", GetName(baseType, attributeType), type);
                             scan = true;
                             break;
                         }
@@ -783,7 +786,7 @@ namespace Umbraco.Core.Composing
         /// Represents a list of types obtained by looking for types inheriting/implementing a
         /// specified type, and/or marked with a specified attribute type.
         /// </summary>
-        internal class TypeList
+        public sealed class TypeList
         {
             private readonly HashSet<Type> _types = new HashSet<Type>();
 
diff --git a/src/Umbraco.Abstractions/Configuration/UmbracoSettings/ITypeFinderConfig.cs b/src/Umbraco.Abstractions/Configuration/UmbracoSettings/ITypeFinderConfig.cs
new file mode 100644
index 0000000000..fd5b18ed39
--- /dev/null
+++ b/src/Umbraco.Abstractions/Configuration/UmbracoSettings/ITypeFinderConfig.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface ITypeFinderConfig
+    {
+        IEnumerable<string> AssembliesAcceptingLoadExceptions { get; }
+    }
+}
diff --git a/src/Umbraco.Core/Manifest/IManifestFilter.cs b/src/Umbraco.Abstractions/Manifest/IManifestFilter.cs
similarity index 89%
rename from src/Umbraco.Core/Manifest/IManifestFilter.cs
rename to src/Umbraco.Abstractions/Manifest/IManifestFilter.cs
index f1e2c633c8..88e00a3966 100644
--- a/src/Umbraco.Core/Manifest/IManifestFilter.cs
+++ b/src/Umbraco.Abstractions/Manifest/IManifestFilter.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 
+
 namespace Umbraco.Core.Manifest
 {
     /// <summary>
@@ -14,6 +15,6 @@ namespace Umbraco.Core.Manifest
         /// <remarks>
         /// <para>It is possible to remove, change, or add manifests.</para>
         /// </remarks>
-        void Filter(List<IPackageManifest> manifests);
+        void Filter(List<PackageManifest> manifests);
     }
 }
diff --git a/src/Umbraco.Core/Manifest/IManifestParser.cs b/src/Umbraco.Abstractions/Manifest/IManifestParser.cs
similarity index 66%
rename from src/Umbraco.Core/Manifest/IManifestParser.cs
rename to src/Umbraco.Abstractions/Manifest/IManifestParser.cs
index 367ee3be77..eeb0c756f6 100644
--- a/src/Umbraco.Core/Manifest/IManifestParser.cs
+++ b/src/Umbraco.Abstractions/Manifest/IManifestParser.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Umbraco.Core.Configuration.Grid;
 using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Core.Manifest
@@ -12,13 +11,13 @@ namespace Umbraco.Core.Manifest
         /// Gets all manifests, merged into a single manifest object.
         /// </summary>
         /// <returns></returns>
-        IPackageManifest Manifest { get; }
+        PackageManifest Manifest { get; }
 
         /// <summary>
         /// Parses a manifest.
         /// </summary>
-        IPackageManifest ParseManifest(string text);
+        PackageManifest ParseManifest(string text);
 
-        IEnumerable<IGridEditorConfig> ParseGridEditors(string text);
+        IEnumerable<GridEditor> ParseGridEditors(string text);
     }
 }
diff --git a/src/Umbraco.Core/Manifest/ManifestContentAppDefinition.cs b/src/Umbraco.Abstractions/Manifest/ManifestContentAppDefinition.cs
similarity index 92%
rename from src/Umbraco.Core/Manifest/ManifestContentAppDefinition.cs
rename to src/Umbraco.Abstractions/Manifest/ManifestContentAppDefinition.cs
index 2aafcd8b74..35293a6377 100644
--- a/src/Umbraco.Core/Manifest/ManifestContentAppDefinition.cs
+++ b/src/Umbraco.Abstractions/Manifest/ManifestContentAppDefinition.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Runtime.Serialization;
-using Umbraco.Core.Composing;
-using Umbraco.Core.IO;
 
 namespace Umbraco.Core.Manifest
 {
@@ -65,11 +63,7 @@ namespace Umbraco.Core.Manifest
         /// Gets or sets the view for rendering the content app.
         /// </summary>
         [DataMember(Name = "view")]
-        public string View
-        {
-            get => _view;
-            set => _view = Current.IOHelper.ResolveVirtualUrl(value);
-        }
+        public string View { get; set; }
 
         /// <summary>
         /// Gets or sets the list of 'show' conditions for the content app.
diff --git a/src/Umbraco.Abstractions/Manifest/ManifestDashboard.cs b/src/Umbraco.Abstractions/Manifest/ManifestDashboard.cs
new file mode 100644
index 0000000000..2d6f96b5c2
--- /dev/null
+++ b/src/Umbraco.Abstractions/Manifest/ManifestDashboard.cs
@@ -0,0 +1,26 @@
+using System;
+using System.ComponentModel;
+using System.Runtime.Serialization;
+using Umbraco.Core.Dashboards;
+
+namespace Umbraco.Core.Manifest
+{
+    [DataContract]
+    public class ManifestDashboard : IDashboard
+    {
+        [DataMember(Name = "alias", IsRequired = true)]
+        public string Alias { get; set; }
+
+        [DataMember(Name = "weight")]
+        public int Weight { get; set; } = 100;
+
+        [DataMember(Name = "view", IsRequired = true)]
+        public string View { get; set; }
+
+        [DataMember(Name = "sections")]
+        public string[] Sections { get; set; } = Array.Empty<string>();
+
+        [DataMember(Name = "access")]
+        public IAccessRule[] AccessRules { get; set; } = Array.Empty<IAccessRule>();
+    }
+}
diff --git a/src/Umbraco.Core/Manifest/ManifestFilterCollection.cs b/src/Umbraco.Abstractions/Manifest/ManifestFilterCollection.cs
similarity index 92%
rename from src/Umbraco.Core/Manifest/ManifestFilterCollection.cs
rename to src/Umbraco.Abstractions/Manifest/ManifestFilterCollection.cs
index 0f49c96094..febdb7e356 100644
--- a/src/Umbraco.Core/Manifest/ManifestFilterCollection.cs
+++ b/src/Umbraco.Abstractions/Manifest/ManifestFilterCollection.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Core.Manifest
         /// Filters package manifests.
         /// </summary>
         /// <param name="manifests">The package manifests.</param>
-        public void Filter(List<IPackageManifest> manifests)
+        public void Filter(List<PackageManifest> manifests)
         {
             foreach (var filter in this)
                 filter.Filter(manifests);
diff --git a/src/Umbraco.Core/Manifest/ManifestFilterCollectionBuilder.cs b/src/Umbraco.Abstractions/Manifest/ManifestFilterCollectionBuilder.cs
similarity index 100%
rename from src/Umbraco.Core/Manifest/ManifestFilterCollectionBuilder.cs
rename to src/Umbraco.Abstractions/Manifest/ManifestFilterCollectionBuilder.cs
diff --git a/src/Umbraco.Core/Manifest/ManifestSection.cs b/src/Umbraco.Abstractions/Manifest/ManifestSection.cs
similarity index 100%
rename from src/Umbraco.Core/Manifest/ManifestSection.cs
rename to src/Umbraco.Abstractions/Manifest/ManifestSection.cs
diff --git a/src/Umbraco.Core/Manifest/PackageManifest.cs b/src/Umbraco.Abstractions/Manifest/PackageManifest.cs
similarity index 82%
rename from src/Umbraco.Core/Manifest/PackageManifest.cs
rename to src/Umbraco.Abstractions/Manifest/PackageManifest.cs
index a81021432d..5e10030693 100644
--- a/src/Umbraco.Core/Manifest/PackageManifest.cs
+++ b/src/Umbraco.Abstractions/Manifest/PackageManifest.cs
@@ -1,5 +1,5 @@
 using System;
-using Newtonsoft.Json;
+using System.Runtime.Serialization;
 using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Core.Manifest
@@ -7,7 +7,8 @@ namespace Umbraco.Core.Manifest
     /// <summary>
     /// Represents the content of a package manifest.
     /// </summary>
-    public class PackageManifest : IPackageManifest
+    [DataContract]
+    public class PackageManifest
     {
         /// <summary>
         /// Gets the source path of the manifest.
@@ -16,55 +17,55 @@ namespace Umbraco.Core.Manifest
         /// <para>Gets the full absolute file path of the manifest,
         /// using system directory separators.</para>
         /// </remarks>
-        [JsonIgnore]
+        [IgnoreDataMember]
         public string Source { get; set; }
 
         /// <summary>
         /// Gets or sets the scripts listed in the manifest.
         /// </summary>
-        [JsonProperty("javascript")]
+        [DataMember(Name = "javascript")]
         public string[] Scripts { get; set; } = Array.Empty<string>();
 
         /// <summary>
         /// Gets or sets the stylesheets listed in the manifest.
         /// </summary>
-        [JsonProperty("css")]
+        [DataMember(Name = "css")]
         public string[] Stylesheets { get; set; } = Array.Empty<string>();
 
         /// <summary>
         /// Gets or sets the property editors listed in the manifest.
         /// </summary>
-        [JsonProperty("propertyEditors")]
+        [DataMember(Name = "propertyEditors")]
         public IDataEditor[] PropertyEditors { get; set; } = Array.Empty<IDataEditor>();
 
         /// <summary>
         /// Gets or sets the parameter editors listed in the manifest.
         /// </summary>
-        [JsonProperty("parameterEditors")]
+        [DataMember(Name = "parameterEditors")]
         public IDataEditor[] ParameterEditors { get; set; } = Array.Empty<IDataEditor>();
 
         /// <summary>
         /// Gets or sets the grid editors listed in the manifest.
         /// </summary>
-        [JsonProperty("gridEditors")]
+        [DataMember(Name = "gridEditors")]
         public GridEditor[] GridEditors { get; set; } = Array.Empty<GridEditor>();
 
         /// <summary>
         /// Gets or sets the content apps listed in the manifest.
         /// </summary>
-        [JsonProperty("contentApps")]
+        [DataMember(Name = "contentApps")]
         public ManifestContentAppDefinition[] ContentApps { get; set; } = Array.Empty<ManifestContentAppDefinition>();
 
         /// <summary>
         /// Gets or sets the dashboards listed in the manifest.
         /// </summary>
-        [JsonProperty("dashboards")]
+        [DataMember(Name = "dashboards")]
         public ManifestDashboard[] Dashboards { get; set; } = Array.Empty<ManifestDashboard>();
 
         /// <summary>
         /// Gets or sets the sections listed in the manifest.
         /// </summary>
-        [JsonProperty("sections")]
+        [DataMember(Name = "sections")]
         public ManifestSection[] Sections { get; set; } = Array.Empty<ManifestSection>();
     }
 }
diff --git a/src/Umbraco.Core/Models/ContentSchedule.cs b/src/Umbraco.Abstractions/Models/ContentSchedule.cs
similarity index 98%
rename from src/Umbraco.Core/Models/ContentSchedule.cs
rename to src/Umbraco.Abstractions/Models/ContentSchedule.cs
index cac4a0fd1c..4dba0456b0 100644
--- a/src/Umbraco.Core/Models/ContentSchedule.cs
+++ b/src/Umbraco.Abstractions/Models/ContentSchedule.cs
@@ -36,7 +36,7 @@ namespace Umbraco.Core.Models
         /// Gets the unique identifier of the document targeted by the scheduled action.
         /// </summary>
         [DataMember]
-        public Guid Id { get; internal set; }
+        public Guid Id { get; set; }
 
         /// <summary>
         /// Gets the culture of the scheduled action.
diff --git a/src/Umbraco.Core/Models/ContentScheduleAction.cs b/src/Umbraco.Abstractions/Models/ContentScheduleAction.cs
similarity index 100%
rename from src/Umbraco.Core/Models/ContentScheduleAction.cs
rename to src/Umbraco.Abstractions/Models/ContentScheduleAction.cs
diff --git a/src/Umbraco.Core/Models/ContentScheduleCollection.cs b/src/Umbraco.Abstractions/Models/ContentScheduleCollection.cs
similarity index 100%
rename from src/Umbraco.Core/Models/ContentScheduleCollection.cs
rename to src/Umbraco.Abstractions/Models/ContentScheduleCollection.cs
diff --git a/src/Umbraco.Core/Models/EntityContainer.cs b/src/Umbraco.Abstractions/Models/EntityContainer.cs
similarity index 98%
rename from src/Umbraco.Core/Models/EntityContainer.cs
rename to src/Umbraco.Abstractions/Models/EntityContainer.cs
index 70f6cbd878..5c2ada7149 100644
--- a/src/Umbraco.Core/Models/EntityContainer.cs
+++ b/src/Umbraco.Abstractions/Models/EntityContainer.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
-using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
 namespace Umbraco.Core.Models
diff --git a/src/Umbraco.Core/Models/IContent.cs b/src/Umbraco.Abstractions/Models/IContent.cs
similarity index 100%
rename from src/Umbraco.Core/Models/IContent.cs
rename to src/Umbraco.Abstractions/Models/IContent.cs
diff --git a/src/Umbraco.Core/Models/IContentBase.cs b/src/Umbraco.Abstractions/Models/IContentBase.cs
similarity index 99%
rename from src/Umbraco.Core/Models/IContentBase.cs
rename to src/Umbraco.Abstractions/Models/IContentBase.cs
index 0f660181fb..1864996379 100644
--- a/src/Umbraco.Core/Models/IContentBase.cs
+++ b/src/Umbraco.Abstractions/Models/IContentBase.cs
@@ -98,7 +98,7 @@ namespace Umbraco.Core.Models
         /// List of properties, which make up all the data available for this Content object
         /// </summary>
         /// <remarks>Properties are loaded as part of the Content object graph</remarks>
-        PropertyCollection Properties { get; set; }
+        IPropertyCollection Properties { get; set; }
 
         /// <summary>
         /// Gets a value indicating whether the content entity has a property with the supplied alias.
diff --git a/src/Umbraco.Core/Models/IDataValueEditor.cs b/src/Umbraco.Abstractions/Models/IDataValueEditor.cs
similarity index 81%
rename from src/Umbraco.Core/Models/IDataValueEditor.cs
rename to src/Umbraco.Abstractions/Models/IDataValueEditor.cs
index cb68531cc7..e095f3aa31 100644
--- a/src/Umbraco.Core/Models/IDataValueEditor.cs
+++ b/src/Umbraco.Abstractions/Models/IDataValueEditor.cs
@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
 using System.Xml.Linq;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Editors;
-using Umbraco.Core.Services;
 
 namespace Umbraco.Core.PropertyEditors
 {
@@ -59,12 +58,12 @@ namespace Umbraco.Core.PropertyEditors
         /// <summary>
         /// Converts a property value to a value for the editor.
         /// </summary>
-        object ToEditor(Property property, IDataTypeService dataTypeService, string culture = null, string segment = null);
+        object ToEditor(IProperty property, string culture = null, string segment = null);
 
         // TODO: / deal with this when unplugging the xml cache
         // why property vs propertyType? services should be injected! etc...
-        IEnumerable<XElement> ConvertDbToXml(Property property, IDataTypeService dataTypeService, ILocalizationService localizationService, bool published);
-        XNode ConvertDbToXml(PropertyType propertyType, object value, IDataTypeService dataTypeService);
-        string ConvertDbToString(PropertyType propertyType, object value, IDataTypeService dataTypeService);
+        IEnumerable<XElement> ConvertDbToXml(IProperty property, bool published);
+        XNode ConvertDbToXml(IPropertyType propertyType, object value);
+        string ConvertDbToString(IPropertyType propertyType, object value);
     }
 }
diff --git a/src/Umbraco.Core/Models/IMedia.cs b/src/Umbraco.Abstractions/Models/IMedia.cs
similarity index 100%
rename from src/Umbraco.Core/Models/IMedia.cs
rename to src/Umbraco.Abstractions/Models/IMedia.cs
diff --git a/src/Umbraco.Abstractions/Models/IProperty.cs b/src/Umbraco.Abstractions/Models/IProperty.cs
new file mode 100644
index 0000000000..cd8a07393e
--- /dev/null
+++ b/src/Umbraco.Abstractions/Models/IProperty.cs
@@ -0,0 +1,106 @@
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Models.Entities;
+
+namespace Umbraco.Core.Models
+{
+    public interface IProperty
+    {
+
+        ValueStorageType ValueStorageType { get; }
+        /// <summary>
+        /// Returns the PropertyType, which this Property is based on
+        /// </summary>
+        IPropertyType PropertyType { get; }
+
+        /// <summary>
+        /// Gets the list of values.
+        /// </summary>
+        IReadOnlyCollection<IPropertyValue> Values { get; set; }
+
+        /// <summary>
+        /// Returns the Alias of the PropertyType, which this Property is based on
+        /// </summary>
+        string Alias { get; }
+
+        /// <inheritdoc />
+        int Id { get; set; }
+
+        /// <inheritdoc />
+        Guid Key { get; set; }
+
+        /// <inheritdoc />
+        DateTime CreateDate { get; set; }
+
+        /// <inheritdoc />
+        DateTime UpdateDate { get; set; }
+
+        /// <inheritdoc />
+        DateTime? DeleteDate { get; set; } // no change tracking - not persisted
+
+        /// <inheritdoc />
+        bool HasIdentity { get; }
+
+        /// <summary>
+        /// Gets the value.
+        /// </summary>
+        object GetValue(string culture = null, string segment = null, bool published = false);
+
+        /// <summary>
+        /// Sets a value.
+        /// </summary>
+        void SetValue(object value, string culture = null, string segment = null);
+
+        /// <summary>
+        /// Resets the entity identity.
+        /// </summary>
+        void ResetIdentity();
+
+        bool Equals(EntityBase other);
+        bool Equals(object obj);
+        int GetHashCode();
+        object DeepClone();
+
+        /// <inheritdoc />
+        bool IsDirty();
+
+        /// <inheritdoc />
+        bool IsPropertyDirty(string propertyName);
+
+        /// <inheritdoc />
+        IEnumerable<string> GetDirtyProperties();
+
+        /// <inheritdoc />
+        /// <remarks>Saves dirty properties so they can be checked with WasDirty.</remarks>
+        void ResetDirtyProperties();
+
+        /// <inheritdoc />
+        bool WasDirty();
+
+        /// <inheritdoc />
+        bool WasPropertyDirty(string propertyName);
+
+        /// <inheritdoc />
+        void ResetWereDirtyProperties();
+
+        /// <inheritdoc />
+        void ResetDirtyProperties(bool rememberDirty);
+
+        /// <inheritdoc />
+        IEnumerable<string> GetWereDirtyProperties();
+
+        /// <summary>
+        /// Disables change tracking.
+        /// </summary>
+        void DisableChangeTracking();
+
+        /// <summary>
+        /// Enables change tracking.
+        /// </summary>
+        void EnableChangeTracking();
+
+        int PropertyTypeId { get; }
+        void PublishValues(string culture = "*", string segment = "*");
+        void UnpublishValues(string culture = "*", string segment = "*");
+    }
+}
diff --git a/src/Umbraco.Abstractions/Models/IPropertyCollection.cs b/src/Umbraco.Abstractions/Models/IPropertyCollection.cs
new file mode 100644
index 0000000000..ec2c4d90ca
--- /dev/null
+++ b/src/Umbraco.Abstractions/Models/IPropertyCollection.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using System.Collections.Specialized;
+
+namespace Umbraco.Core.Models
+{
+    public interface IPropertyCollection : IEnumerable<IProperty>
+    {
+        bool TryGetValue(string propertyTypeAlias, out IProperty property);
+        bool Contains(string key);
+
+        event NotifyCollectionChangedEventHandler CollectionChanged;
+
+        void EnsurePropertyTypes(IEnumerable<IPropertyType> propertyTypes);
+        void EnsureCleanPropertyTypes(IEnumerable<IPropertyType> propertyTypes);
+        object DeepClone();
+
+        IProperty this[string name] { get; }
+        IProperty this[int index] { get; }
+        void Add(IProperty property);
+
+        int Count { get; }
+    }
+}
diff --git a/src/Umbraco.Abstractions/Models/IPropertyType.cs b/src/Umbraco.Abstractions/Models/IPropertyType.cs
new file mode 100644
index 0000000000..4447a858ab
--- /dev/null
+++ b/src/Umbraco.Abstractions/Models/IPropertyType.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Runtime.Serialization;
+using Umbraco.Core.Models.Entities;
+
+namespace Umbraco.Core.Models
+{
+    public interface IPropertyType : IEntity
+    {
+        [DataMember]
+        string Name { get; }
+        [DataMember]
+        string Alias { get; }
+        [DataMember]
+        string Description { get; }
+        [DataMember]
+        int DataTypeId { get; }
+        [DataMember]
+        Guid DataTypeKey { get; }
+        [DataMember]
+        string PropertyEditorAlias { get; }
+        [DataMember]
+        ValueStorageType ValueStorageType { get; }
+        [DataMember]
+        Lazy<int> PropertyGroupId { get; }
+        [DataMember]
+        bool Mandatory { get; }
+        [DataMember]
+        int SortOrder { get; }
+        [DataMember]
+        string ValidationRegExp { get; }
+
+        bool SupportsPublishing { get;  }
+
+        ContentVariation Variations { get; }
+
+
+
+        bool SupportsVariation(string culture, string segment, bool wildcards = false);
+        object ConvertAssignedValue(object value);
+
+
+    }
+}
diff --git a/src/Umbraco.Abstractions/Models/IPropertyValue.cs b/src/Umbraco.Abstractions/Models/IPropertyValue.cs
new file mode 100644
index 0000000000..abc459a72f
--- /dev/null
+++ b/src/Umbraco.Abstractions/Models/IPropertyValue.cs
@@ -0,0 +1,34 @@
+namespace Umbraco.Core.Models
+{
+    public interface IPropertyValue
+    {
+        /// <summary>
+        /// Gets or sets the culture of the property.
+        /// </summary>
+        /// <remarks>The culture is either null (invariant) or a non-empty string. If the property is
+        /// set with an empty or whitespace value, its value is converted to null.</remarks>
+        string Culture { get; set; }
+
+        /// <summary>
+        /// Gets or sets the segment of the property.
+        /// </summary>
+        /// <remarks>The segment is either null (neutral) or a non-empty string. If the property is
+        /// set with an empty or whitespace value, its value is converted to null.</remarks>
+        string Segment { get; set; }
+
+        /// <summary>
+        /// Gets or sets the edited value of the property.
+        /// </summary>
+        object EditedValue { get; set; }
+
+        /// <summary>
+        /// Gets or sets the published value of the property.
+        /// </summary>
+        object PublishedValue { get; set; }
+
+        /// <summary>
+        /// Clones the property value.
+        /// </summary>
+        IPropertyValue Clone();
+    }
+}
diff --git a/src/Umbraco.Abstractions/Models/IScript.cs b/src/Umbraco.Abstractions/Models/IScript.cs
new file mode 100644
index 0000000000..9fdc321107
--- /dev/null
+++ b/src/Umbraco.Abstractions/Models/IScript.cs
@@ -0,0 +1,7 @@
+namespace Umbraco.Core.Models
+{
+    public interface IScript : IFile
+    {
+
+    }
+}
diff --git a/src/Umbraco.Abstractions/Models/IStylesheet.cs b/src/Umbraco.Abstractions/Models/IStylesheet.cs
new file mode 100644
index 0000000000..737118d646
--- /dev/null
+++ b/src/Umbraco.Abstractions/Models/IStylesheet.cs
@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+using Umbraco.Core.Models.Entities;
+
+namespace Umbraco.Core.Models
+{
+    public interface IStylesheet : IFile, IRememberBeingDirty
+    {
+        /// <summary>
+        /// Returns a list of umbraco back office enabled stylesheet properties
+        /// </summary>
+        /// <remarks>
+        /// An umbraco back office enabled stylesheet property has a special prefix, for example:
+        ///
+        /// /** umb_name: MyPropertyName */ p { font-size: 1em; }
+        /// </remarks>
+        IEnumerable<IStylesheetProperty> Properties { get; }
+
+        /// <summary>
+        /// Adds an Umbraco stylesheet property for use in the back office
+        /// </summary>
+        /// <param name="property"></param>
+        void AddProperty(IStylesheetProperty property);
+
+        /// <summary>
+        /// Removes an Umbraco stylesheet property
+        /// </summary>
+        /// <param name="name"></param>
+        void RemoveProperty(string name);
+    }
+}
diff --git a/src/Umbraco.Abstractions/Models/IStylesheetProperty.cs b/src/Umbraco.Abstractions/Models/IStylesheetProperty.cs
new file mode 100644
index 0000000000..c44a147d54
--- /dev/null
+++ b/src/Umbraco.Abstractions/Models/IStylesheetProperty.cs
@@ -0,0 +1,11 @@
+using Umbraco.Core.Models.Entities;
+
+namespace Umbraco.Core.Models
+{
+    public interface IStylesheetProperty : IRememberBeingDirty
+    {
+        string Alias { get; set; }
+        string Name { get;  }
+        string Value { get; set; }
+    }
+}
diff --git a/src/Umbraco.Abstractions/Models/Identity/IUserLoginInfo.cs b/src/Umbraco.Abstractions/Models/Identity/IUserLoginInfo.cs
new file mode 100644
index 0000000000..84dc1da7e0
--- /dev/null
+++ b/src/Umbraco.Abstractions/Models/Identity/IUserLoginInfo.cs
@@ -0,0 +1,13 @@
+namespace Umbraco.Core.Models.Identity
+{
+    public interface IUserLoginInfo
+    {
+        /// <summary>
+        ///     Provider for the linked login, i.e. Facebook, Google, etc.
+        /// </summary>
+        string LoginProvider { get; set; }
+
+        /// <summary>User specific key for the login provider</summary>
+        string ProviderKey { get; set; }
+    }
+}
diff --git a/src/Umbraco.Abstractions/Models/Script.cs b/src/Umbraco.Abstractions/Models/Script.cs
index b6e49f72ee..be96c04ddd 100644
--- a/src/Umbraco.Abstractions/Models/Script.cs
+++ b/src/Umbraco.Abstractions/Models/Script.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
-    public class Script : File
+    public class Script : File, IScript
     {
         public Script(string path)
             : this(path, (Func<File, string>) null)
@@ -25,9 +25,6 @@ namespace Umbraco.Core.Models
         /// <remarks>
         /// Overrides the default Entity identity check.
         /// </remarks>
-        public override bool HasIdentity
-        {
-            get { return string.IsNullOrEmpty(Path) == false; }
-        }
+        public override bool HasIdentity => string.IsNullOrEmpty(Path) == false;
     }
 }
diff --git a/src/Umbraco.Abstractions/Models/Stylesheet.cs b/src/Umbraco.Abstractions/Models/Stylesheet.cs
index df5786a340..48f00a1650 100644
--- a/src/Umbraco.Abstractions/Models/Stylesheet.cs
+++ b/src/Umbraco.Abstractions/Models/Stylesheet.cs
@@ -13,7 +13,7 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
-    public class Stylesheet : File
+    public class Stylesheet : File, IStylesheet
     {
         public Stylesheet(string path)
             : this(path, null)
@@ -120,7 +120,7 @@ namespace Umbraco.Core.Models
         /// /** umb_name: MyPropertyName */ p { font-size: 1em; }
         /// </remarks>
         [IgnoreDataMember]
-        public IEnumerable<StylesheetProperty> Properties
+        public IEnumerable<IStylesheetProperty> Properties
         {
             get { return _properties.Value; }
         }
@@ -129,7 +129,7 @@ namespace Umbraco.Core.Models
         /// Adds an Umbraco stylesheet property for use in the back office
         /// </summary>
         /// <param name="property"></param>
-        public void AddProperty(StylesheetProperty property)
+        public void AddProperty(IStylesheetProperty property)
         {
             if (Properties.Any(x => x.Name.InvariantEquals(property.Name)))
             {
diff --git a/src/Umbraco.Abstractions/Models/StylesheetProperty.cs b/src/Umbraco.Abstractions/Models/StylesheetProperty.cs
index 089f89deb6..bc895113bc 100644
--- a/src/Umbraco.Abstractions/Models/StylesheetProperty.cs
+++ b/src/Umbraco.Abstractions/Models/StylesheetProperty.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Models
     /// </remarks>
     [Serializable]
     [DataContract(IsReference = true)]
-    public class StylesheetProperty : BeingDirtyBase, IValueObject
+    public class StylesheetProperty : BeingDirtyBase, IValueObject, IStylesheetProperty
     {
         private string _alias;
         private string _value;
diff --git a/src/Umbraco.Core/Persistence/IQueryRepository.cs b/src/Umbraco.Abstractions/Persistence/IQueryRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/IQueryRepository.cs
rename to src/Umbraco.Abstractions/Persistence/IQueryRepository.cs
diff --git a/src/Umbraco.Core/Persistence/IReadRepository.cs b/src/Umbraco.Abstractions/Persistence/IReadRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/IReadRepository.cs
rename to src/Umbraco.Abstractions/Persistence/IReadRepository.cs
diff --git a/src/Umbraco.Core/Persistence/IReadWriteQueryRepository.cs b/src/Umbraco.Abstractions/Persistence/IReadWriteQueryRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/IReadWriteQueryRepository.cs
rename to src/Umbraco.Abstractions/Persistence/IReadWriteQueryRepository.cs
diff --git a/src/Umbraco.Core/Persistence/IRepository.cs b/src/Umbraco.Abstractions/Persistence/IRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/IRepository.cs
rename to src/Umbraco.Abstractions/Persistence/IRepository.cs
diff --git a/src/Umbraco.Core/Persistence/IWriteRepository.cs b/src/Umbraco.Abstractions/Persistence/IWriteRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/IWriteRepository.cs
rename to src/Umbraco.Abstractions/Persistence/IWriteRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Querying/IQuery.cs b/src/Umbraco.Abstractions/Persistence/Querying/IQuery.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Querying/IQuery.cs
rename to src/Umbraco.Abstractions/Persistence/Querying/IQuery.cs
diff --git a/src/Umbraco.Core/Persistence/Querying/StringPropertyMatchType.cs b/src/Umbraco.Abstractions/Persistence/Querying/StringPropertyMatchType.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Querying/StringPropertyMatchType.cs
rename to src/Umbraco.Abstractions/Persistence/Querying/StringPropertyMatchType.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IAuditEntryRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IAuditEntryRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IAuditEntryRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/IAuditEntryRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IAuditRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IAuditRepository.cs
similarity index 96%
rename from src/Umbraco.Core/Persistence/Repositories/IAuditRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/IAuditRepository.cs
index b2dd6a3297..fbd9ec2e13 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IAuditRepository.cs
+++ b/src/Umbraco.Abstractions/Persistence/Repositories/IAuditRepository.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using Umbraco.Core.Models;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Querying;
 
 namespace Umbraco.Core.Persistence.Repositories
diff --git a/src/Umbraco.Core/Persistence/Repositories/IConsentRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IConsentRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IConsentRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/IConsentRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IDataTypeContainerRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IDataTypeContainerRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IDataTypeContainerRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/IDataTypeContainerRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IDictionaryRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IDictionaryRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IDictionaryRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/IDictionaryRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IDocumentTypeContainerRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IDocumentTypeContainerRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IDocumentTypeContainerRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/IDocumentTypeContainerRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IDomainRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IDomainRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IDomainRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/IDomainRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IEntityContainerRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IEntityContainerRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IEntityContainerRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/IEntityContainerRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IExternalLoginRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IExternalLoginRepository.cs
similarity index 71%
rename from src/Umbraco.Core/Persistence/Repositories/IExternalLoginRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/IExternalLoginRepository.cs
index 6d145e9961..ed6f2e4fb1 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IExternalLoginRepository.cs
+++ b/src/Umbraco.Abstractions/Persistence/Repositories/IExternalLoginRepository.cs
@@ -1,12 +1,11 @@
 using System.Collections.Generic;
-using Microsoft.AspNet.Identity;
 using Umbraco.Core.Models.Identity;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
     public interface IExternalLoginRepository : IReadWriteQueryRepository<int, IIdentityUserLogin>
     {
-        void SaveUserLogins(int memberId, IEnumerable<UserLoginInfo> logins);
+        void SaveUserLogins(int memberId, IEnumerable<IUserLoginInfo> logins);
         void DeleteUserLogins(int memberId);
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/ILanguageRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/ILanguageRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/ILanguageRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/ILanguageRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IMacroRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IMacroRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IMacroRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/IMacroRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IMediaTypeContainerRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IMediaTypeContainerRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IMediaTypeContainerRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/IMediaTypeContainerRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IMemberGroupRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IMemberGroupRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IMemberGroupRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/IMemberGroupRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/INotificationsRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/INotificationsRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/INotificationsRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/INotificationsRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IPartialViewMacroRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IPartialViewMacroRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IPartialViewMacroRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/IPartialViewMacroRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IPartialViewRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IPartialViewRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IPartialViewRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/IPartialViewRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IRedirectUrlRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IRedirectUrlRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IRedirectUrlRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/IRedirectUrlRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IRelationRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IRelationRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IRelationRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/IRelationRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IRelationTypeRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IRelationTypeRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IRelationTypeRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/IRelationTypeRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IScriptRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IScriptRepository.cs
similarity index 66%
rename from src/Umbraco.Core/Persistence/Repositories/IScriptRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/IScriptRepository.cs
index ea88cb7618..70226777b5 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IScriptRepository.cs
+++ b/src/Umbraco.Abstractions/Persistence/Repositories/IScriptRepository.cs
@@ -3,11 +3,14 @@ using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    public interface IScriptRepository : IReadRepository<string, Script>, IWriteRepository<Script>
+    public interface IScriptRepository : IReadRepository<string, IScript>, IWriteRepository<IScript>
     {
-        bool ValidateScript(Script script);
+        bool ValidateScript(IScript script);
         Stream GetFileContentStream(string filepath);
         void SetFileContent(string filepath, Stream content);
         long GetFileSize(string filepath);
+
+        void AddFolder(string folderPath);
+        void DeleteFolder(string folderPath);
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/IServerRegistrationRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IServerRegistrationRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IServerRegistrationRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/IServerRegistrationRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IStylesheetRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IStylesheetRepository.cs
similarity index 63%
rename from src/Umbraco.Core/Persistence/Repositories/IStylesheetRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/IStylesheetRepository.cs
index 1643e6e7a7..dbcab32dbf 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IStylesheetRepository.cs
+++ b/src/Umbraco.Abstractions/Persistence/Repositories/IStylesheetRepository.cs
@@ -3,11 +3,14 @@ using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    public interface IStylesheetRepository : IReadRepository<string, Stylesheet>, IWriteRepository<Stylesheet>
+    public interface IStylesheetRepository : IReadRepository<string, IStylesheet>, IWriteRepository<IStylesheet>
     {
-        bool ValidateStylesheet(Stylesheet stylesheet);
+        bool ValidateStylesheet(IStylesheet stylesheet);
         Stream GetFileContentStream(string filepath);
         void SetFileContent(string filepath, Stream content);
         long GetFileSize(string filepath);
+
+        void AddFolder(string folderPath);
+        void DeleteFolder(string folderPath);
     }
 }
diff --git a/src/Umbraco.Core/Persistence/Repositories/ITagRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/ITagRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/ITagRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/ITagRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/ITemplateRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/ITemplateRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/ITemplateRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/ITemplateRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IUserGroupRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IUserGroupRepository.cs
similarity index 100%
rename from src/Umbraco.Core/Persistence/Repositories/IUserGroupRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/IUserGroupRepository.cs
diff --git a/src/Umbraco.Core/Persistence/Repositories/IUserRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IUserRepository.cs
similarity index 97%
rename from src/Umbraco.Core/Persistence/Repositories/IUserRepository.cs
rename to src/Umbraco.Abstractions/Persistence/Repositories/IUserRepository.cs
index 0ec7972d08..29ae581459 100644
--- a/src/Umbraco.Core/Persistence/Repositories/IUserRepository.cs
+++ b/src/Umbraco.Abstractions/Persistence/Repositories/IUserRepository.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Querying;
 
 namespace Umbraco.Core.Persistence.Repositories
@@ -43,7 +42,6 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <param name="pageSize"></param>
         /// <param name="totalRecords"></param>
         /// <param name="orderBy"></param>
-        /// <param name="customFilter"></param>
         /// <param name="orderDirection"></param>
         /// <param name="includeUserGroups">
         /// A filter to only include user that belong to these user groups
@@ -52,6 +50,7 @@ namespace Umbraco.Core.Persistence.Repositories
         /// A filter to only include users that do not belong to these user groups
         /// </param>
         /// <param name="userState">Optional parameter to filter by specified user state</param>
+        /// <param name="filter"></param>
         /// <returns></returns>
         IEnumerable<IUser> GetPagedResultsByQuery(IQuery<IUser> query, long pageIndex, int pageSize, out long totalRecords,
             Expression<Func<IUser, object>> orderBy, Direction orderDirection = Direction.Ascending,
diff --git a/src/Umbraco.Core/PropertyEditors/ConfigurationField.cs b/src/Umbraco.Abstractions/PropertyEditors/ConfigurationField.cs
similarity index 83%
rename from src/Umbraco.Core/PropertyEditors/ConfigurationField.cs
rename to src/Umbraco.Abstractions/PropertyEditors/ConfigurationField.cs
index ee07f8dcef..52df839712 100644
--- a/src/Umbraco.Core/PropertyEditors/ConfigurationField.cs
+++ b/src/Umbraco.Abstractions/PropertyEditors/ConfigurationField.cs
@@ -1,15 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Newtonsoft.Json;
-using Umbraco.Core.Composing;
-using Umbraco.Core.IO;
+using System.Reflection;
+using System.Runtime.Serialization;
 
 namespace Umbraco.Core.PropertyEditors
 {
     /// <summary>
     /// Represents a datatype configuration field for editing.
     /// </summary>
+    [DataContract]
     public class ConfigurationField
     {
         private string _view;
@@ -50,37 +50,35 @@ namespace Umbraco.Core.PropertyEditors
         /// <summary>
         /// Gets or sets the key of the field.
         /// </summary>
-        [JsonProperty("key", Required = Required.Always)]
+        [DataMember(Name = "key", IsRequired = true)]
         public string Key { get; set; }
 
         /// <summary>
         /// Gets or sets the name of the field.
         /// </summary>
-        [JsonProperty("label", Required = Required.Always)]
+        [DataMember(Name = "label", IsRequired = true)]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the property name of the field.
         /// </summary>
-        [JsonIgnore]
         public string PropertyName { get; set; }
 
         /// <summary>
         /// Gets or sets the property CLR type of the field.
         /// </summary>
-        [JsonIgnore]
         public Type PropertyType { get; set; }
 
         /// <summary>
         /// Gets or sets the description of the field.
         /// </summary>
-        [JsonProperty("description")]
+        [DataMember(Name = "description")]
         public string Description { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether to hide the label of the field.
         /// </summary>
-        [JsonProperty("hideLabel")]
+        [DataMember(Name = "hideLabel")]
         public bool HideLabel { get; set; }
 
         /// <summary>
@@ -90,23 +88,19 @@ namespace Umbraco.Core.PropertyEditors
         /// <para>Can be the full virtual path, or the relative path to the Umbraco folder,
         /// or a simple view name which will map to ~/Views/PreValueEditors/{view}.html.</para>
         /// </remarks>
-        [JsonProperty("view", Required = Required.Always)]
-        public string View
-        {
-            get => _view;
-            set => _view = Current.IOHelper.ResolveVirtualUrl(value);
-        }
+        [DataMember(Name = "view", IsRequired = true)]
+        public string View { get; set; }
 
         /// <summary>
         /// Gets the validators of the field.
         /// </summary>
-        [JsonProperty("validation")]
+        [DataMember(Name = "validation")]
         public List<IValueValidator> Validators { get; }
 
         /// <summary>
         /// Gets or sets extra configuration properties for the editor.
         /// </summary>
-        [JsonProperty("config")]
+        [DataMember(Name = "config")]
         public IDictionary<string, object> Config { get; set; }
     }
 }
diff --git a/src/Umbraco.Core/PropertyEditors/ConfigurationFieldAttribute.cs b/src/Umbraco.Abstractions/PropertyEditors/ConfigurationFieldAttribute.cs
similarity index 100%
rename from src/Umbraco.Core/PropertyEditors/ConfigurationFieldAttribute.cs
rename to src/Umbraco.Abstractions/PropertyEditors/ConfigurationFieldAttribute.cs
diff --git a/src/Umbraco.Core/PropertyEditors/GridEditor.cs b/src/Umbraco.Abstractions/PropertyEditors/GridEditor.cs
similarity index 68%
rename from src/Umbraco.Core/PropertyEditors/GridEditor.cs
rename to src/Umbraco.Abstractions/PropertyEditors/GridEditor.cs
index 388e79675c..7af72cf5ea 100644
--- a/src/Umbraco.Core/PropertyEditors/GridEditor.cs
+++ b/src/Umbraco.Abstractions/PropertyEditors/GridEditor.cs
@@ -1,48 +1,37 @@
 using System.Collections.Generic;
-using Newtonsoft.Json;
-using Umbraco.Core.Composing;
+using System.Runtime.Serialization;
 using Umbraco.Core.Configuration.Grid;
-using Umbraco.Core.IO;
 
 namespace Umbraco.Core.PropertyEditors
 {
+
+    [DataContract]
     public class GridEditor : IGridEditorConfig
     {
-        private string _view;
-        private string _render;
-
         public GridEditor()
         {
             Config = new Dictionary<string, object>();
         }
 
-        [JsonProperty("name", Required = Required.Always)]
+        [DataMember(Name = "name", IsRequired = true)]
         public string Name { get; set; }
 
-        [JsonProperty("nameTemplate")]
+        [DataMember(Name = "nameTemplate")]
         public string NameTemplate { get; set; }
 
-        [JsonProperty("alias", Required = Required.Always)]
+        [DataMember(Name = "alias", IsRequired = true)]
         public string Alias { get; set; }
 
-        [JsonProperty("view", Required = Required.Always)]
-        public string View
-        {
-            get => _view;
-            set => _view = Current.IOHelper.ResolveVirtualUrl(value);
-        }
+        [DataMember(Name = "view", IsRequired = true)]
+        public string View{ get; set; }
 
-        [JsonProperty("render")]
-        public string Render
-        {
-            get => _render;
-            set => _render = Current.IOHelper.ResolveVirtualUrl(value);
-        }
+        [DataMember(Name = "render")]
+        public string Render { get; set; }
 
-        [JsonProperty("icon", Required = Required.Always)]
+        [DataMember(Name = "icon", IsRequired = true)]
         public string Icon { get; set; }
 
-        [JsonProperty("config")]
+        [DataMember(Name = "config")]
         public IDictionary<string, object> Config { get; set; }
 
         protected bool Equals(GridEditor other)
diff --git a/src/Umbraco.Core/PropertyEditors/IConfigurationEditor.cs b/src/Umbraco.Abstractions/PropertyEditors/IConfigurationEditor.cs
similarity index 100%
rename from src/Umbraco.Core/PropertyEditors/IConfigurationEditor.cs
rename to src/Umbraco.Abstractions/PropertyEditors/IConfigurationEditor.cs
diff --git a/src/Umbraco.Core/Models/IDataEditor.cs b/src/Umbraco.Abstractions/PropertyEditors/IDataEditor.cs
similarity index 99%
rename from src/Umbraco.Core/Models/IDataEditor.cs
rename to src/Umbraco.Abstractions/PropertyEditors/IDataEditor.cs
index 5d1aece6e5..3685cc6494 100644
--- a/src/Umbraco.Core/Models/IDataEditor.cs
+++ b/src/Umbraco.Abstractions/PropertyEditors/IDataEditor.cs
@@ -52,6 +52,7 @@ namespace Umbraco.Core.PropertyEditors
         /// Gets a configured value editor.
         /// </summary>
         IDataValueEditor GetValueEditor(object configuration);
+
         /// <summary>
         /// Gets the configuration for the value editor.
         /// </summary>
diff --git a/src/Umbraco.Core/PropertyEditors/IManifestValueValidator.cs b/src/Umbraco.Abstractions/PropertyEditors/IManifestValueValidator.cs
similarity index 100%
rename from src/Umbraco.Core/PropertyEditors/IManifestValueValidator.cs
rename to src/Umbraco.Abstractions/PropertyEditors/IManifestValueValidator.cs
diff --git a/src/Umbraco.Core/PropertyEditors/IPropertyIndexValueFactory.cs b/src/Umbraco.Abstractions/PropertyEditors/IPropertyIndexValueFactory.cs
similarity index 92%
rename from src/Umbraco.Core/PropertyEditors/IPropertyIndexValueFactory.cs
rename to src/Umbraco.Abstractions/PropertyEditors/IPropertyIndexValueFactory.cs
index fd4e272f08..26552afc6f 100644
--- a/src/Umbraco.Core/PropertyEditors/IPropertyIndexValueFactory.cs
+++ b/src/Umbraco.Abstractions/PropertyEditors/IPropertyIndexValueFactory.cs
@@ -19,6 +19,6 @@ namespace Umbraco.Core.PropertyEditors
         /// values. By default, there would be only one object: the property value. But some implementations may return
         /// more than one value for a given field.</para>
         /// </remarks>
-        IEnumerable<KeyValuePair<string, IEnumerable<object>>> GetIndexValues(Property property, string culture, string segment, bool published);
+        IEnumerable<KeyValuePair<string, IEnumerable<object>>> GetIndexValues(IProperty property, string culture, string segment, bool published);
     }
 }
diff --git a/src/Umbraco.Core/PropertyEditors/IValueFormatValidator.cs b/src/Umbraco.Abstractions/PropertyEditors/IValueFormatValidator.cs
similarity index 100%
rename from src/Umbraco.Core/PropertyEditors/IValueFormatValidator.cs
rename to src/Umbraco.Abstractions/PropertyEditors/IValueFormatValidator.cs
diff --git a/src/Umbraco.Core/PropertyEditors/IValueRequiredValidator.cs b/src/Umbraco.Abstractions/PropertyEditors/IValueRequiredValidator.cs
similarity index 100%
rename from src/Umbraco.Core/PropertyEditors/IValueRequiredValidator.cs
rename to src/Umbraco.Abstractions/PropertyEditors/IValueRequiredValidator.cs
diff --git a/src/Umbraco.Core/PropertyEditors/IValueValidator.cs b/src/Umbraco.Abstractions/PropertyEditors/IValueValidator.cs
similarity index 100%
rename from src/Umbraco.Core/PropertyEditors/IValueValidator.cs
rename to src/Umbraco.Abstractions/PropertyEditors/IValueValidator.cs
diff --git a/src/Umbraco.Core/PropertyEditors/ManifestValueValidatorCollection.cs b/src/Umbraco.Abstractions/PropertyEditors/ManifestValueValidatorCollection.cs
similarity index 100%
rename from src/Umbraco.Core/PropertyEditors/ManifestValueValidatorCollection.cs
rename to src/Umbraco.Abstractions/PropertyEditors/ManifestValueValidatorCollection.cs
diff --git a/src/Umbraco.Abstractions/PropertyEditors/ManifestValueValidatorCollectionBuilder.cs b/src/Umbraco.Abstractions/PropertyEditors/ManifestValueValidatorCollectionBuilder.cs
new file mode 100644
index 0000000000..0ebda864f6
--- /dev/null
+++ b/src/Umbraco.Abstractions/PropertyEditors/ManifestValueValidatorCollectionBuilder.cs
@@ -0,0 +1,9 @@
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core.PropertyEditors
+{
+    public class ManifestValueValidatorCollectionBuilder : LazyCollectionBuilderBase<ManifestValueValidatorCollectionBuilder, ManifestValueValidatorCollection, IManifestValueValidator>
+    {
+        protected override ManifestValueValidatorCollectionBuilder This => this;
+    }
+}
diff --git a/src/Umbraco.Core/PropertyEditors/Validators/DecimalValidator.cs b/src/Umbraco.Abstractions/PropertyEditors/Validators/DecimalValidator.cs
similarity index 92%
rename from src/Umbraco.Core/PropertyEditors/Validators/DecimalValidator.cs
rename to src/Umbraco.Abstractions/PropertyEditors/Validators/DecimalValidator.cs
index 86db995566..f464044923 100644
--- a/src/Umbraco.Core/PropertyEditors/Validators/DecimalValidator.cs
+++ b/src/Umbraco.Abstractions/PropertyEditors/Validators/DecimalValidator.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Core.PropertyEditors.Validators
     /// <summary>
     /// A validator that validates that the value is a valid decimal
     /// </summary>
-    internal sealed class DecimalValidator : IManifestValueValidator
+    public sealed class DecimalValidator : IManifestValueValidator
     {
         /// <inheritdoc />
         public string ValidationName => "Decimal";
diff --git a/src/Umbraco.Core/PropertyEditors/Validators/EmailValidator.cs b/src/Umbraco.Abstractions/PropertyEditors/Validators/EmailValidator.cs
similarity index 92%
rename from src/Umbraco.Core/PropertyEditors/Validators/EmailValidator.cs
rename to src/Umbraco.Abstractions/PropertyEditors/Validators/EmailValidator.cs
index 4df11e4f60..8fb6d0c31b 100644
--- a/src/Umbraco.Core/PropertyEditors/Validators/EmailValidator.cs
+++ b/src/Umbraco.Abstractions/PropertyEditors/Validators/EmailValidator.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Core.PropertyEditors.Validators
     /// <summary>
     /// A validator that validates an email address
     /// </summary>
-    internal sealed class EmailValidator : IManifestValueValidator
+    public sealed class EmailValidator : IManifestValueValidator
     {
         /// <inheritdoc />
         public string ValidationName => "Email";
diff --git a/src/Umbraco.Core/PropertyEditors/Validators/IntegerValidator.cs b/src/Umbraco.Abstractions/PropertyEditors/Validators/IntegerValidator.cs
similarity index 92%
rename from src/Umbraco.Core/PropertyEditors/Validators/IntegerValidator.cs
rename to src/Umbraco.Abstractions/PropertyEditors/Validators/IntegerValidator.cs
index 335ddf7724..5274ff484b 100644
--- a/src/Umbraco.Core/PropertyEditors/Validators/IntegerValidator.cs
+++ b/src/Umbraco.Abstractions/PropertyEditors/Validators/IntegerValidator.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Core.PropertyEditors.Validators
     /// <summary>
     /// A validator that validates that the value is a valid integer
     /// </summary>
-    internal sealed class IntegerValidator : IManifestValueValidator
+    public sealed class IntegerValidator : IManifestValueValidator
     {
         /// <inheritdoc />
         public string ValidationName => "Integer";
diff --git a/src/Umbraco.Core/Services/Changes/TreeChange.cs b/src/Umbraco.Abstractions/Services/Changes/TreeChange.cs
similarity index 95%
rename from src/Umbraco.Core/Services/Changes/TreeChange.cs
rename to src/Umbraco.Abstractions/Services/Changes/TreeChange.cs
index 81c9b67c3f..605cde87a2 100644
--- a/src/Umbraco.Core/Services/Changes/TreeChange.cs
+++ b/src/Umbraco.Abstractions/Services/Changes/TreeChange.cs
@@ -3,7 +3,7 @@ using System.Linq;
 
 namespace Umbraco.Core.Services.Changes
 {
-    internal class TreeChange<TItem>
+    public class TreeChange<TItem>
     {
         public TreeChange(TItem changedItem, TreeChangeTypes changeTypes)
         {
diff --git a/src/Umbraco.Core/Services/Changes/TreeChangeExtensions.cs b/src/Umbraco.Abstractions/Services/Changes/TreeChangeExtensions.cs
similarity index 88%
rename from src/Umbraco.Core/Services/Changes/TreeChangeExtensions.cs
rename to src/Umbraco.Abstractions/Services/Changes/TreeChangeExtensions.cs
index a5f5efdba9..6971ebc91f 100644
--- a/src/Umbraco.Core/Services/Changes/TreeChangeExtensions.cs
+++ b/src/Umbraco.Abstractions/Services/Changes/TreeChangeExtensions.cs
@@ -4,7 +4,7 @@ namespace Umbraco.Core.Services.Changes
 {
     public static class TreeChangeExtensions
     {
-        internal static TreeChange<TItem>.EventArgs ToEventArgs<TItem>(this IEnumerable<TreeChange<TItem>> changes)
+        public static TreeChange<TItem>.EventArgs ToEventArgs<TItem>(this IEnumerable<TreeChange<TItem>> changes)
         {
             return new TreeChange<TItem>.EventArgs(changes);
         }
diff --git a/src/Umbraco.Core/Services/IAuditService.cs b/src/Umbraco.Abstractions/Services/IAuditService.cs
similarity index 98%
rename from src/Umbraco.Core/Services/IAuditService.cs
rename to src/Umbraco.Abstractions/Services/IAuditService.cs
index f9b5aa2d87..de4ec889cd 100644
--- a/src/Umbraco.Core/Services/IAuditService.cs
+++ b/src/Umbraco.Abstractions/Services/IAuditService.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Umbraco.Core.Models;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Querying;
 
 namespace Umbraco.Core.Services
diff --git a/src/Umbraco.Core/Services/IContentServiceBase.cs b/src/Umbraco.Abstractions/Services/IContentServiceBase.cs
similarity index 100%
rename from src/Umbraco.Core/Services/IContentServiceBase.cs
rename to src/Umbraco.Abstractions/Services/IContentServiceBase.cs
diff --git a/src/Umbraco.Core/Services/IExternalLoginService.cs b/src/Umbraco.Abstractions/Services/IExternalLoginService.cs
similarity index 87%
rename from src/Umbraco.Core/Services/IExternalLoginService.cs
rename to src/Umbraco.Abstractions/Services/IExternalLoginService.cs
index a81543cf2d..d57bb052af 100644
--- a/src/Umbraco.Core/Services/IExternalLoginService.cs
+++ b/src/Umbraco.Abstractions/Services/IExternalLoginService.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Microsoft.AspNet.Identity;
 using Umbraco.Core.Models.Identity;
 
 namespace Umbraco.Core.Services
@@ -22,14 +21,14 @@ namespace Umbraco.Core.Services
         /// </summary>
         /// <param name="login"></param>
         /// <returns></returns>
-        IEnumerable<IIdentityUserLogin> Find(UserLoginInfo login);
+        IEnumerable<IIdentityUserLogin> Find(IUserLoginInfo login);
 
         /// <summary>
         /// Save user logins
         /// </summary>
         /// <param name="userId"></param>
         /// <param name="logins"></param>
-        void SaveUserLogins(int userId, IEnumerable<UserLoginInfo> logins);
+        void SaveUserLogins(int userId, IEnumerable<IUserLoginInfo> logins);
 
         /// <summary>
         /// Deletes all user logins - normally used when a member is deleted
diff --git a/src/Umbraco.Core/Services/IFileService.cs b/src/Umbraco.Abstractions/Services/IFileService.cs
similarity index 88%
rename from src/Umbraco.Core/Services/IFileService.cs
rename to src/Umbraco.Abstractions/Services/IFileService.cs
index 5fe52559ee..00e99e1c38 100644
--- a/src/Umbraco.Core/Services/IFileService.cs
+++ b/src/Umbraco.Abstractions/Services/IFileService.cs
@@ -24,28 +24,28 @@ namespace Umbraco.Core.Services
         bool DeletePartialViewMacro(string path, int userId = Constants.Security.SuperUserId);
         Attempt<IPartialView> SavePartialView(IPartialView partialView, int userId = Constants.Security.SuperUserId);
         Attempt<IPartialView> SavePartialViewMacro(IPartialView partialView, int userId = Constants.Security.SuperUserId);
-        bool ValidatePartialView(PartialView partialView);
-        bool ValidatePartialViewMacro(PartialView partialView);
+        bool ValidatePartialView(IPartialView partialView);
+        bool ValidatePartialViewMacro(IPartialView partialView);
 
         /// <summary>
-        /// Gets a list of all <see cref="Stylesheet"/> objects
+        /// Gets a list of all <see cref="IStylesheet"/> objects
         /// </summary>
-        /// <returns>An enumerable list of <see cref="Stylesheet"/> objects</returns>
-        IEnumerable<Stylesheet> GetStylesheets(params string[] names);
+        /// <returns>An enumerable list of <see cref="IStylesheet"/> objects</returns>
+        IEnumerable<IStylesheet> GetStylesheets(params string[] names);
 
         /// <summary>
-        /// Gets a <see cref="Stylesheet"/> object by its name
+        /// Gets a <see cref="IStylesheet"/> object by its name
         /// </summary>
         /// <param name="name">Name of the stylesheet incl. extension</param>
-        /// <returns>A <see cref="Stylesheet"/> object</returns>
-        Stylesheet GetStylesheetByName(string name);
+        /// <returns>A <see cref="IStylesheet"/> object</returns>
+        IStylesheet GetStylesheetByName(string name);
 
         /// <summary>
-        /// Saves a <see cref="Stylesheet"/>
+        /// Saves a <see cref="IStylesheet"/>
         /// </summary>
-        /// <param name="stylesheet"><see cref="Stylesheet"/> to save</param>
+        /// <param name="stylesheet"><see cref="IStylesheet"/> to save</param>
         /// <param name="userId">Optional id of the user saving the stylesheet</param>
-        void SaveStylesheet(Stylesheet stylesheet, int userId = Constants.Security.SuperUserId);
+        void SaveStylesheet(IStylesheet stylesheet, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes a stylesheet by its name
@@ -55,31 +55,31 @@ namespace Umbraco.Core.Services
         void DeleteStylesheet(string path, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
-        /// Validates a <see cref="Stylesheet"/>
+        /// Validates a <see cref="IStylesheet"/>
         /// </summary>
-        /// <param name="stylesheet"><see cref="Stylesheet"/> to validate</param>
+        /// <param name="stylesheet"><see cref="IStylesheet"/> to validate</param>
         /// <returns>True if Stylesheet is valid, otherwise false</returns>
-        bool ValidateStylesheet(Stylesheet stylesheet);
+        bool ValidateStylesheet(IStylesheet stylesheet);
 
         /// <summary>
-        /// Gets a list of all <see cref="Script"/> objects
+        /// Gets a list of all <see cref="IScript"/> objects
         /// </summary>
-        /// <returns>An enumerable list of <see cref="Script"/> objects</returns>
-        IEnumerable<Script> GetScripts(params string[] names);
+        /// <returns>An enumerable list of <see cref="IScript"/> objects</returns>
+        IEnumerable<IScript> GetScripts(params string[] names);
 
         /// <summary>
-        /// Gets a <see cref="Script"/> object by its name
+        /// Gets a <see cref="IScript"/> object by its name
         /// </summary>
         /// <param name="name">Name of the script incl. extension</param>
-        /// <returns>A <see cref="Script"/> object</returns>
-        Script GetScriptByName(string name);
+        /// <returns>A <see cref="IScript"/> object</returns>
+        IScript GetScriptByName(string name);
 
         /// <summary>
         /// Saves a <see cref="Script"/>
         /// </summary>
-        /// <param name="script"><see cref="Script"/> to save</param>
+        /// <param name="script"><see cref="IScript"/> to save</param>
         /// <param name="userId">Optional id of the user saving the script</param>
-        void SaveScript(Script script, int userId = Constants.Security.SuperUserId);
+        void SaveScript(IScript script, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
         /// Deletes a script by its name
@@ -89,11 +89,11 @@ namespace Umbraco.Core.Services
         void DeleteScript(string path, int userId = Constants.Security.SuperUserId);
 
         /// <summary>
-        /// Validates a <see cref="Script"/>
+        /// Validates a <see cref="IScript"/>
         /// </summary>
-        /// <param name="script"><see cref="Script"/> to validate</param>
+        /// <param name="script"><see cref="IScript"/> to validate</param>
         /// <returns>True if Script is valid, otherwise false</returns>
-        bool ValidateScript(Script script);
+        bool ValidateScript(IScript script);
 
         /// <summary>
         /// Creates a folder for scripts
@@ -213,7 +213,7 @@ namespace Umbraco.Core.Services
         /// Validates a <see cref="ITemplate"/>
         /// </summary>
         /// <param name="template"><see cref="ITemplate"/> to validate</param>
-        /// <returns>True if Script is valid, otherwise false</returns>
+        /// <returns>True if template is valid, otherwise false</returns>
         bool ValidateTemplate(ITemplate template);
 
         /// <summary>
diff --git a/src/Umbraco.Core/Services/ILocalizationService.cs b/src/Umbraco.Abstractions/Services/ILocalizationService.cs
similarity index 97%
rename from src/Umbraco.Core/Services/ILocalizationService.cs
rename to src/Umbraco.Abstractions/Services/ILocalizationService.cs
index 019e07493a..b8c4e21f2a 100644
--- a/src/Umbraco.Core/Services/ILocalizationService.cs
+++ b/src/Umbraco.Abstractions/Services/ILocalizationService.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Core.Services
         /// Adds or updates a translation for a dictionary item and language
         /// </summary>
         /// <param name="item"></param>
-        /// <param name="language"></param>
+        /// <param name="language"></param
         /// <param name="value"></param>
         /// <returns></returns>
         void AddOrUpdateDictionaryValue(IDictionaryItem item, ILanguage language, string value);
@@ -104,10 +104,10 @@ namespace Umbraco.Core.Services
         ILanguage GetLanguageById(int id);
 
         /// <summary>
-        /// Gets a <see cref="Language"/> by its iso code
+        /// Gets a <see cref="ILanguage"/> by its iso code
         /// </summary>
         /// <param name="isoCode">Iso Code of the language (ie. en-US)</param>
-        /// <returns><see cref="Language"/></returns>
+        /// <returns><see cref="ILanguage"/></returns>
         ILanguage GetLanguageByIsoCode(string isoCode);
 
         /// <summary>
diff --git a/src/Umbraco.Core/Services/IMacroService.cs b/src/Umbraco.Abstractions/Services/IMacroService.cs
similarity index 100%
rename from src/Umbraco.Core/Services/IMacroService.cs
rename to src/Umbraco.Abstractions/Services/IMacroService.cs
diff --git a/src/Umbraco.Abstractions/Services/IMembershipMemberService.cs b/src/Umbraco.Abstractions/Services/IMembershipMemberService.cs
new file mode 100644
index 0000000000..a224dfc967
--- /dev/null
+++ b/src/Umbraco.Abstractions/Services/IMembershipMemberService.cs
@@ -0,0 +1,153 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Persistence.Querying;
+
+namespace Umbraco.Core.Services
+{
+    /// <summary>
+    /// Defines part of the UserService/MemberService, which is specific to methods used by the membership provider.
+    /// The generic type is restricted to <see cref="IMembershipUser"/>. The implementation of this interface  uses
+    /// either <see cref="IMember"/> for the MemberService or <see cref="IUser"/> for the UserService.
+    /// </summary>
+    /// <remarks>
+    /// Idea is to have this as an isolated interface so that it can be easily 'replaced' in the membership provider implementation.
+    /// </remarks>
+    public interface IMembershipMemberService<T> : IService
+        where T : class, IMembershipUser
+    {
+        /// <summary>
+        /// Gets the total number of Members or Users based on the count type
+        /// </summary>
+        /// <remarks>
+        /// The way the Online count is done is the same way that it is done in the MS SqlMembershipProvider - We query for any members
+        /// that have their last active date within the Membership.UserIsOnlineTimeWindow (which is in minutes). It isn't exact science
+        /// but that is how MS have made theirs so we'll follow that principal.
+        /// </remarks>
+        /// <param name="countType"><see cref="MemberCountType"/> to count by</param>
+        /// <returns><see cref="System.int"/> with number of Members or Users for passed in type</returns>
+        int GetCount(MemberCountType countType);
+
+        /// <summary>
+        /// Checks if a Member with the username exists
+        /// </summary>
+        /// <param name="username">Username to check</param>
+        /// <returns><c>True</c> if the Member exists otherwise <c>False</c></returns>
+        bool Exists(string username);
+
+        /// <summary>
+        /// Creates and persists a new <see cref="IMembershipUser"/>
+        /// </summary>
+        /// <remarks>An <see cref="IMembershipUser"/> can be of type <see cref="IMember"/> or <see cref="IUser"/></remarks>
+        /// <param name="username">Username of the <see cref="IMembershipUser"/> to create</param>
+        /// <param name="email">Email of the <see cref="IMembershipUser"/> to create</param>
+        /// <param name="passwordValue">This value should be the encoded/encrypted/hashed value for the password that will be stored in the database</param>
+        /// <param name="memberTypeAlias">Alias of the Type</param>
+        /// <returns><see cref="IMembershipUser"/></returns>
+        T CreateWithIdentity(string username, string email, string passwordValue, string memberTypeAlias);
+
+        /// <summary>
+        /// Creates and persists a new <see cref="IMembershipUser"/>
+        /// </summary>
+        /// <remarks>An <see cref="IMembershipUser"/> can be of type <see cref="IMember"/> or <see cref="IUser"/></remarks>
+        /// <param name="username">Username of the <see cref="IMembershipUser"/> to create</param>
+        /// <param name="email">Email of the <see cref="IMembershipUser"/> to create</param>
+        /// <param name="passwordValue">This value should be the encoded/encrypted/hashed value for the password that will be stored in the database</param>
+        /// <param name="memberTypeAlias">Alias of the Type</param>
+        /// <param name="isApproved">IsApproved of the <see cref="IMembershipUser"/> to create</param>
+        /// <returns><see cref="IMembershipUser"/></returns>
+        T CreateWithIdentity(string username, string email, string passwordValue, string memberTypeAlias, bool isApproved);
+
+        /// <summary>
+        /// Gets an <see cref="IMembershipUser"/> by its provider key
+        /// </summary>
+        /// <remarks>An <see cref="IMembershipUser"/> can be of type <see cref="IMember"/> or <see cref="IUser"/></remarks>
+        /// <param name="id">Id to use for retrieval</param>
+        /// <returns><see cref="IMembershipUser"/></returns>
+        T GetByProviderKey(object id);
+
+        /// <summary>
+        /// Get an <see cref="IMembershipUser"/> by email
+        /// </summary>
+        /// <remarks>An <see cref="IMembershipUser"/> can be of type <see cref="IMember"/> or <see cref="IUser"/></remarks>
+        /// <param name="email">Email to use for retrieval</param>
+        /// <returns><see cref="IMembershipUser"/></returns>
+        T GetByEmail(string email);
+
+        /// <summary>
+        /// Get an <see cref="IMembershipUser"/> by username
+        /// </summary>
+        /// <remarks>An <see cref="IMembershipUser"/> can be of type <see cref="IMember"/> or <see cref="IUser"/></remarks>
+        /// <param name="username">Username to use for retrieval</param>
+        /// <returns><see cref="IMembershipUser"/></returns>
+        T GetByUsername(string username);
+
+        /// <summary>
+        /// Deletes an <see cref="IMembershipUser"/>
+        /// </summary>
+        /// <remarks>An <see cref="IMembershipUser"/> can be of type <see cref="IMember"/> or <see cref="IUser"/></remarks>
+        /// <param name="membershipUser"><see cref="IMember"/> or <see cref="IUser"/> to Delete</param>
+        void Delete(T membershipUser);
+
+        /// <summary>
+        /// Saves an <see cref="IMembershipUser"/>
+        /// </summary>
+        /// <remarks>An <see cref="IMembershipUser"/> can be of type <see cref="IMember"/> or <see cref="IUser"/></remarks>
+        /// <param name="entity"><see cref="IMember"/> or <see cref="IUser"/> to Save</param>
+        /// <param name="raiseEvents">Optional parameter to raise events.
+        /// Default is <c>True</c> otherwise set to <c>False</c> to not raise events</param>
+        void Save(T entity, bool raiseEvents = true);
+
+        /// <summary>
+        /// Saves a list of <see cref="IMembershipUser"/> objects
+        /// </summary>
+        /// <remarks>An <see cref="IMembershipUser"/> can be of type <see cref="IMember"/> or <see cref="IUser"/></remarks>
+        /// <param name="entities"><see cref="IEnumerable{T}"/> to save</param>
+        /// <param name="raiseEvents">Optional parameter to raise events.
+        /// Default is <c>True</c> otherwise set to <c>False</c> to not raise events</param>
+        void Save(IEnumerable<T> entities, bool raiseEvents = true);
+
+        /// <summary>
+        /// Gets the default MemberType alias
+        /// </summary>
+        /// <remarks>By default we'll return the 'writer', but we need to check it exists. If it doesn't we'll
+        /// return the first type that is not an admin, otherwise if there's only one we will return that one.</remarks>
+        /// <returns>Alias of the default MemberType</returns>
+        string GetDefaultMemberType();
+
+        /// <summary>
+        /// Finds a list of <see cref="IMembershipUser"/> objects by a partial email string
+        /// </summary>
+        /// <remarks>An <see cref="IMembershipUser"/> can be of type <see cref="IMember"/> or <see cref="IUser"/></remarks>
+        /// <param name="emailStringToMatch">Partial email string to match</param>
+        /// <param name="pageIndex">Current page index</param>
+        /// <param name="pageSize">Size of the page</param>
+        /// <param name="totalRecords">Total number of records found (out)</param>
+        /// <param name="matchType">The type of match to make as <see cref="StringPropertyMatchType"/>. Default is <see cref="StringPropertyMatchType.StartsWith"/></param>
+        /// <returns><see cref="IEnumerable{T}"/></returns>
+        IEnumerable<T> FindByEmail(string emailStringToMatch, long pageIndex, int pageSize, out long totalRecords, StringPropertyMatchType matchType = StringPropertyMatchType.StartsWith);
+
+        /// <summary>
+        /// Finds a list of <see cref="IMembershipUser"/> objects by a partial username
+        /// </summary>
+        /// <remarks>An <see cref="IMembershipUser"/> can be of type <see cref="IMember"/> or <see cref="IUser"/></remarks>
+        /// <param name="login">Partial username to match</param>
+        /// <param name="pageIndex">Current page index</param>
+        /// <param name="pageSize">Size of the page</param>
+        /// <param name="totalRecords">Total number of records found (out)</param>
+        /// <param name="matchType">The type of match to make as <see cref="StringPropertyMatchType"/>. Default is <see cref="StringPropertyMatchType.StartsWith"/></param>
+        /// <returns><see cref="IEnumerable{T}"/></returns>
+        IEnumerable<T> FindByUsername(string login, long pageIndex, int pageSize, out long totalRecords, StringPropertyMatchType matchType = StringPropertyMatchType.StartsWith);
+
+        /// <summary>
+        /// Gets a list of paged <see cref="IMembershipUser"/> objects
+        /// </summary>
+        /// <remarks>An <see cref="IMembershipUser"/> can be of type <see cref="IMember"/> or <see cref="IUser"/></remarks>
+        /// <param name="pageIndex">Current page index</param>
+        /// <param name="pageSize">Size of the page</param>
+        /// <param name="totalRecords">Total number of records found (out)</param>
+        /// <returns><see cref="IEnumerable{T}"/></returns>
+        IEnumerable<T> GetAll(long pageIndex, int pageSize, out long totalRecords);
+    }
+}
diff --git a/src/Umbraco.Core/Services/IMembershipRoleService.cs b/src/Umbraco.Abstractions/Services/IMembershipRoleService.cs
similarity index 100%
rename from src/Umbraco.Core/Services/IMembershipRoleService.cs
rename to src/Umbraco.Abstractions/Services/IMembershipRoleService.cs
diff --git a/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj b/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj
index 1b52570acf..4fbb43e33d 100644
--- a/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj
+++ b/src/Umbraco.Abstractions/Umbraco.Abstractions.csproj
@@ -11,6 +11,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+      <PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0" />
       <PackageReference Include="System.Runtime.Caching" Version="4.6.0" />
     </ItemGroup>
 
diff --git a/src/Umbraco.Core/Xml/DynamicContext.cs b/src/Umbraco.Abstractions/Xml/DynamicContext.cs
similarity index 100%
rename from src/Umbraco.Core/Xml/DynamicContext.cs
rename to src/Umbraco.Abstractions/Xml/DynamicContext.cs
diff --git a/src/Umbraco.Core/Xml/UmbracoXPathPathSyntaxParser.cs b/src/Umbraco.Abstractions/Xml/UmbracoXPathPathSyntaxParser.cs
similarity index 98%
rename from src/Umbraco.Core/Xml/UmbracoXPathPathSyntaxParser.cs
rename to src/Umbraco.Abstractions/Xml/UmbracoXPathPathSyntaxParser.cs
index b31fa6a8df..0c8136421d 100644
--- a/src/Umbraco.Core/Xml/UmbracoXPathPathSyntaxParser.cs
+++ b/src/Umbraco.Abstractions/Xml/UmbracoXPathPathSyntaxParser.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Umbraco.Core.Exceptions;
 
 namespace Umbraco.Core.Xml
@@ -11,7 +9,7 @@ namespace Umbraco.Core.Xml
     /// This is used to parse our customize Umbraco XPath expressions (i.e. that include special tokens like $site) into
     /// a real XPath statement
     /// </summary>
-    internal class UmbracoXPathPathSyntaxParser
+    public class UmbracoXPathPathSyntaxParser
     {
         /// <summary>
         /// Parses custom umbraco xpath expression
diff --git a/src/Umbraco.Core/Xml/XPath/INavigableContent.cs b/src/Umbraco.Abstractions/Xml/XPath/INavigableContent.cs
similarity index 98%
rename from src/Umbraco.Core/Xml/XPath/INavigableContent.cs
rename to src/Umbraco.Abstractions/Xml/XPath/INavigableContent.cs
index eeb7891726..c0b3192830 100644
--- a/src/Umbraco.Core/Xml/XPath/INavigableContent.cs
+++ b/src/Umbraco.Abstractions/Xml/XPath/INavigableContent.cs
@@ -5,7 +5,7 @@ namespace Umbraco.Core.Xml.XPath
     /// <summary>
     /// Represents a content that can be navigated via XPath.
     /// </summary>
-    interface INavigableContent
+    public interface INavigableContent
     {
         /// <summary>
         /// Gets the unique identifier of the navigable content.
diff --git a/src/Umbraco.Core/Xml/XPath/INavigableContentType.cs b/src/Umbraco.Abstractions/Xml/XPath/INavigableContentType.cs
similarity index 93%
rename from src/Umbraco.Core/Xml/XPath/INavigableContentType.cs
rename to src/Umbraco.Abstractions/Xml/XPath/INavigableContentType.cs
index 94b225467c..1fff0b60bb 100644
--- a/src/Umbraco.Core/Xml/XPath/INavigableContentType.cs
+++ b/src/Umbraco.Abstractions/Xml/XPath/INavigableContentType.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Core.Xml.XPath
     /// <summary>
     /// Represents the type of a content that can be navigated via XPath.
     /// </summary>
-    interface INavigableContentType
+    public interface INavigableContentType
     {
         /// <summary>
         /// Gets the name of the content type.
diff --git a/src/Umbraco.Core/Xml/XPath/INavigableFieldType.cs b/src/Umbraco.Abstractions/Xml/XPath/INavigableFieldType.cs
similarity index 95%
rename from src/Umbraco.Core/Xml/XPath/INavigableFieldType.cs
rename to src/Umbraco.Abstractions/Xml/XPath/INavigableFieldType.cs
index 32a6f64751..d741060865 100644
--- a/src/Umbraco.Core/Xml/XPath/INavigableFieldType.cs
+++ b/src/Umbraco.Abstractions/Xml/XPath/INavigableFieldType.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Core.Xml.XPath
     /// Represents the type of a field of a content that can be navigated via XPath.
     /// </summary>
     /// <remarks>A field can be an attribute or a property.</remarks>
-    interface INavigableFieldType
+    public interface INavigableFieldType
     {
         /// <summary>
         /// Gets the name of the field type.
diff --git a/src/Umbraco.Core/Xml/XPath/INavigableSource.cs b/src/Umbraco.Abstractions/Xml/XPath/INavigableSource.cs
similarity index 96%
rename from src/Umbraco.Core/Xml/XPath/INavigableSource.cs
rename to src/Umbraco.Abstractions/Xml/XPath/INavigableSource.cs
index 68dc9e906a..7a605574d7 100644
--- a/src/Umbraco.Core/Xml/XPath/INavigableSource.cs
+++ b/src/Umbraco.Abstractions/Xml/XPath/INavigableSource.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Core.Xml.XPath
     /// <summary>
     /// Represents a source of content that can be navigated via XPath.
     /// </summary>
-    interface INavigableSource
+    public interface INavigableSource
     {
         /// <summary>
         /// Gets a content identified by its unique identifier.
diff --git a/src/Umbraco.Core/Xml/XPath/MacroNavigator.cs b/src/Umbraco.Abstractions/Xml/XPath/MacroNavigator.cs
similarity index 99%
rename from src/Umbraco.Core/Xml/XPath/MacroNavigator.cs
rename to src/Umbraco.Abstractions/Xml/XPath/MacroNavigator.cs
index 8b4755107a..dc2246834e 100644
--- a/src/Umbraco.Core/Xml/XPath/MacroNavigator.cs
+++ b/src/Umbraco.Abstractions/Xml/XPath/MacroNavigator.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Xml.XPath
     /// <summary>
     /// Provides a cursor model for navigating {macro /} as if it were XML.
     /// </summary>
-    class MacroNavigator : XPathNavigator
+    public class MacroNavigator : XPathNavigator
     {
         private readonly XmlNameTable _nameTable;
         private readonly MacroRoot _macro;
@@ -55,7 +55,7 @@ namespace Umbraco.Core.Xml.XPath
         private int _tabs;
         private readonly int _uid = GetUid();
         private static int _uidg;
-        private readonly static object Uidl = new object();
+        private static readonly object Uidl = new object();
         private static int GetUid()
         {
             lock (Uidl)
diff --git a/src/Umbraco.Core/Xml/XPath/NavigableNavigator.cs b/src/Umbraco.Abstractions/Xml/XPath/NavigableNavigator.cs
similarity index 99%
rename from src/Umbraco.Core/Xml/XPath/NavigableNavigator.cs
rename to src/Umbraco.Abstractions/Xml/XPath/NavigableNavigator.cs
index dc89de8372..e178ab918e 100644
--- a/src/Umbraco.Core/Xml/XPath/NavigableNavigator.cs
+++ b/src/Umbraco.Abstractions/Xml/XPath/NavigableNavigator.cs
@@ -25,7 +25,7 @@ namespace Umbraco.Core.Xml.XPath
     /// <summary>
     /// Provides a cursor model for navigating Umbraco data as if it were XML.
     /// </summary>
-    class NavigableNavigator : XPathNavigator
+    public class NavigableNavigator : XPathNavigator
     {
         // "The XmlNameTable stores atomized strings of any local name, namespace URI,
         // and prefix used by the XPathNavigator. This means that when the same Name is
@@ -1089,7 +1089,7 @@ namespace Umbraco.Core.Xml.XPath
         #region State management
 
         // the possible state positions
-        internal enum StatePosition
+        public enum StatePosition
         {
             Root,
             Element,
@@ -1101,10 +1101,10 @@ namespace Umbraco.Core.Xml.XPath
 
         // gets the state
         // for unit tests only
-        internal State InternalState => _state;
+        public State InternalState => _state;
 
         // represents the XPathNavigator state
-        internal class State
+        public class State
         {
             public StatePosition Position { get; set; }
 
diff --git a/src/Umbraco.Core/Xml/XPath/RenamedRootNavigator.cs b/src/Umbraco.Abstractions/Xml/XPath/RenamedRootNavigator.cs
similarity index 100%
rename from src/Umbraco.Core/Xml/XPath/RenamedRootNavigator.cs
rename to src/Umbraco.Abstractions/Xml/XPath/RenamedRootNavigator.cs
diff --git a/src/Umbraco.Core/Xml/XPathNavigatorExtensions.cs b/src/Umbraco.Abstractions/Xml/XPathNavigatorExtensions.cs
similarity index 98%
rename from src/Umbraco.Core/Xml/XPathNavigatorExtensions.cs
rename to src/Umbraco.Abstractions/Xml/XPathNavigatorExtensions.cs
index b80836dde8..bb3b41511b 100644
--- a/src/Umbraco.Core/Xml/XPathNavigatorExtensions.cs
+++ b/src/Umbraco.Abstractions/Xml/XPathNavigatorExtensions.cs
@@ -5,7 +5,7 @@ namespace Umbraco.Core.Xml
     /// <summary>
     /// Provides extensions to XPathNavigator.
     /// </summary>
-    internal static class XPathNavigatorExtensions
+    public static class XPathNavigatorExtensions
     {
         /// <summary>
         /// Selects a node set, using the specified XPath expression.
diff --git a/src/Umbraco.Core/Xml/XPathVariable.cs b/src/Umbraco.Abstractions/Xml/XPathVariable.cs
similarity index 100%
rename from src/Umbraco.Core/Xml/XPathVariable.cs
rename to src/Umbraco.Abstractions/Xml/XPathVariable.cs
diff --git a/src/Umbraco.Abstractions/Xml/XmlHelper.cs b/src/Umbraco.Abstractions/Xml/XmlHelper.cs
new file mode 100644
index 0000000000..0a435b23f7
--- /dev/null
+++ b/src/Umbraco.Abstractions/Xml/XmlHelper.cs
@@ -0,0 +1,221 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Xml;
+using System.Xml.XPath;
+using Umbraco.Core.Exceptions;
+
+namespace Umbraco.Core.Xml
+{
+    /// <summary>
+    /// The XmlHelper class contains general helper methods for working with xml in umbraco.
+    /// </summary>
+    public class XmlHelper
+    {
+
+        /// <summary>
+        /// Gets a value indicating whether a specified string contains only xml whitespace characters.
+        /// </summary>
+        /// <param name="s">The string.</param>
+        /// <returns><c>true</c> if the string contains only xml whitespace characters.</returns>
+        /// <remarks>As per XML 1.1 specs, space, \t, \r and \n.</remarks>
+        public static bool IsXmlWhitespace(string s)
+        {
+            // as per xml 1.1 specs - anything else is significant whitespace
+            s = s.Trim(' ', '\t', '\r', '\n');
+            return s.Length == 0;
+        }
+
+        /// <summary>
+        /// Creates a new <c>XPathDocument</c> from an xml string.
+        /// </summary>
+        /// <param name="xml">The xml string.</param>
+        /// <returns>An <c>XPathDocument</c> created from the xml string.</returns>
+        public static XPathDocument CreateXPathDocument(string xml)
+        {
+            return new XPathDocument(new XmlTextReader(new StringReader(xml)));
+        }
+
+        /// <summary>
+        /// Tries to create a new <c>XPathDocument</c> from an xml string.
+        /// </summary>
+        /// <param name="xml">The xml string.</param>
+        /// <param name="doc">The XPath document.</param>
+        /// <returns>A value indicating whether it has been possible to create the document.</returns>
+        public static bool TryCreateXPathDocument(string xml, out XPathDocument doc)
+        {
+            try
+            {
+                doc = CreateXPathDocument(xml);
+                return true;
+            }
+            catch (Exception)
+            {
+                doc = null;
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Tries to create a new <c>XPathDocument</c> from a property value.
+        /// </summary>
+        /// <param name="value">The value of the property.</param>
+        /// <param name="doc">The XPath document.</param>
+        /// <returns>A value indicating whether it has been possible to create the document.</returns>
+        /// <remarks>The value can be anything... Performance-wise, this is bad.</remarks>
+        public static bool TryCreateXPathDocumentFromPropertyValue(object value, out XPathDocument doc)
+        {
+            // DynamicNode.ConvertPropertyValueByDataType first cleans the value by calling
+            // XmlHelper.StripDashesInElementOrAttributeName - this is because the XML is
+            // to be returned as a DynamicXml and element names such as "value-item" are
+            // invalid and must be converted to "valueitem". But we don't have that sort of
+            // problem here - and we don't need to bother with dashes nor dots, etc.
+
+            doc = null;
+            var xml = value as string;
+            if (xml == null) return false; // no a string
+            if (CouldItBeXml(xml) == false) return false; // string does not look like it's xml
+            if (IsXmlWhitespace(xml)) return false; // string is whitespace, xml-wise
+            if (TryCreateXPathDocument(xml, out doc) == false) return false; // string can't be parsed into xml
+
+            var nav = doc.CreateNavigator();
+            if (nav.MoveToFirstChild())
+            {
+                //SD: This used to do this but the razor macros and the entire razor macros section is gone, it was all legacy, it seems this method isn't even
+                // used apart from for tests so don't think this matters. In any case, we no longer check for this!
+
+                //var name = nav.LocalName; // must not match an excluded tag
+                //if (UmbracoConfig.For.UmbracoSettings().Scripting.NotDynamicXmlDocumentElements.All(x => x.Element.InvariantEquals(name) == false)) return true;
+
+                return true;
+            }
+
+            doc = null;
+            return false;
+        }
+
+
+        /// <summary>
+        /// Sorts the children of a parentNode.
+        /// </summary>
+        /// <param name="parentNode">The parent node.</param>
+        /// <param name="childNodesXPath">An XPath expression to select children of <paramref name="parentNode"/> to sort.</param>
+        /// <param name="orderBy">A function returning the value to order the nodes by.</param>
+        public static void SortNodes(
+            XmlNode parentNode,
+            string childNodesXPath,
+            Func<XmlNode, int> orderBy)
+        {
+            var sortedChildNodes = parentNode.SelectNodes(childNodesXPath).Cast<XmlNode>()
+                .OrderBy(orderBy)
+                .ToArray();
+
+            // append child nodes to last position, in sort-order
+            // so all child nodes will go after the property nodes
+            foreach (var node in sortedChildNodes)
+                parentNode.AppendChild(node); // moves the node to the last position
+        }
+
+
+        /// <summary>
+        /// Sorts a single child node of a parentNode.
+        /// </summary>
+        /// <param name="parentNode">The parent node.</param>
+        /// <param name="childNodesXPath">An XPath expression to select children of <paramref name="parentNode"/> to sort.</param>
+        /// <param name="node">The child node to sort.</param>
+        /// <param name="orderBy">A function returning the value to order the nodes by.</param>
+        /// <returns>A value indicating whether sorting was needed.</returns>
+        /// <remarks>Assuming all nodes but <paramref name="node"/> are sorted, this will move the node to
+        /// the right position without moving all the nodes (as SortNodes would do) - should improve perfs.</remarks>
+        public static bool SortNode(
+            XmlNode parentNode,
+            string childNodesXPath,
+            XmlNode node,
+            Func<XmlNode, int> orderBy)
+        {
+            var nodeSortOrder = orderBy(node);
+            var childNodesAndOrder = parentNode.SelectNodes(childNodesXPath).Cast<XmlNode>()
+                .Select(x => Tuple.Create(x, orderBy(x))).ToArray();
+
+            // only one node = node is in the right place already, obviously
+            if (childNodesAndOrder.Length == 1) return false;
+
+            // find the first node with a sortOrder > node.sortOrder
+            var i = 0;
+            while (i < childNodesAndOrder.Length && childNodesAndOrder[i].Item2 <= nodeSortOrder)
+               i++;
+
+            // if one was found
+            if (i < childNodesAndOrder.Length)
+            {
+                // and node is just before, we're done already
+                // else we need to move it right before the node that was found
+                if (i == 0 || childNodesAndOrder[i - 1].Item1 != node)
+                {
+                    parentNode.InsertBefore(node, childNodesAndOrder[i].Item1);
+                    return true;
+                }
+            }
+            else // i == childNodesAndOrder.Length && childNodesAndOrder.Length > 1
+            {
+                // and node is the last one, we're done already
+                // else we need to append it as the last one
+                // (and i > 1, see above)
+                if (childNodesAndOrder[i - 1].Item1 != node)
+                {
+                    parentNode.AppendChild(node);
+                    return true;
+                }
+            }
+            return false;
+        }
+
+
+
+        /// <summary>
+        /// Gets the value of a XmlNode
+        /// </summary>
+        /// <param name="n">The XmlNode.</param>
+        /// <returns>the value as a string</returns>
+        public static string GetNodeValue(XmlNode n)
+        {
+            var value = string.Empty;
+            if (n == null || n.FirstChild == null)
+                return value;
+            value = n.FirstChild.Value ?? n.InnerXml;
+            return value.Replace("<!--CDATAOPENTAG-->", "<![CDATA[").Replace("<!--CDATACLOSETAG-->", "]]>");
+        }
+
+        /// <summary>
+        /// Determines whether the specified string appears to be XML.
+        /// </summary>
+        /// <param name="xml">The XML string.</param>
+        /// <returns>
+        ///     <c>true</c> if the specified string appears to be XML; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool CouldItBeXml(string xml)
+        {
+            if (string.IsNullOrEmpty(xml)) return false;
+
+            xml = xml.Trim();
+            return xml.StartsWith("<") && xml.EndsWith(">") && xml.Contains('/');
+        }
+
+        /// <summary>
+        /// Return a dictionary of attributes found for a string based tag
+        /// </summary>
+        /// <param name="tag"></param>
+        /// <returns></returns>
+        public static Dictionary<string, string> GetAttributesFromElement(string tag)
+        {
+            var m =
+                Regex.Matches(tag, "(?<attributeName>\\S*)=\"(?<attributeValue>[^\"]*)\"",
+                              RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
+            // fix for issue 14862: return lowercase attributes for case insensitive matching
+            var d = m.Cast<Match>().ToDictionary(attributeSet => attributeSet.Groups["attributeName"].Value.ToString().ToLower(), attributeSet => attributeSet.Groups["attributeValue"].Value.ToString());
+            return d;
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Xml/XmlNamespaces.cs b/src/Umbraco.Abstractions/Xml/XmlNamespaces.cs
similarity index 100%
rename from src/Umbraco.Core/Xml/XmlNamespaces.cs
rename to src/Umbraco.Abstractions/Xml/XmlNamespaces.cs
diff --git a/src/Umbraco.Core/Xml/XmlNodeListFactory.cs b/src/Umbraco.Abstractions/Xml/XmlNodeListFactory.cs
similarity index 99%
rename from src/Umbraco.Core/Xml/XmlNodeListFactory.cs
rename to src/Umbraco.Abstractions/Xml/XmlNodeListFactory.cs
index bc8deaab2a..0a5f2c859d 100644
--- a/src/Umbraco.Core/Xml/XmlNodeListFactory.cs
+++ b/src/Umbraco.Abstractions/Xml/XmlNodeListFactory.cs
@@ -7,7 +7,7 @@ using System.Xml.XPath;
 
 namespace Umbraco.Core.Xml
 {
-    class XmlNodeListFactory
+    public class XmlNodeListFactory
     {
         private XmlNodeListFactory() { }
 
diff --git a/src/Umbraco.Core/XmlExtensions.cs b/src/Umbraco.Abstractions/XmlExtensions.cs
similarity index 99%
rename from src/Umbraco.Core/XmlExtensions.cs
rename to src/Umbraco.Abstractions/XmlExtensions.cs
index 199e16195b..ef0132dd69 100644
--- a/src/Umbraco.Core/XmlExtensions.cs
+++ b/src/Umbraco.Abstractions/XmlExtensions.cs
@@ -14,7 +14,7 @@ namespace Umbraco.Core
     /// <summary>
     /// Extension methods for xml objects
     /// </summary>
-    internal static class XmlExtensions
+    public static class XmlExtensions
     {
         public static bool HasAttribute(this XmlAttributeCollection attributes, string attributeName)
         {
diff --git a/src/Umbraco.Core/CompositionExtensions_Essentials.cs b/src/Umbraco.Core/CompositionExtensions_Essentials.cs
index b85479716c..20c1646629 100644
--- a/src/Umbraco.Core/CompositionExtensions_Essentials.cs
+++ b/src/Umbraco.Core/CompositionExtensions_Essentials.cs
@@ -1,5 +1,6 @@
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 
@@ -19,7 +20,9 @@ namespace Umbraco.Core
             AppCaches appCaches,
             IUmbracoDatabaseFactory databaseFactory,
             TypeLoader typeLoader,
-            IRuntimeState state)
+            IRuntimeState state,
+            ITypeFinder typeFinder,
+            IIOHelper ioHelper)
         {
             composition.RegisterUnique(logger);
             composition.RegisterUnique(profiler);
@@ -30,6 +33,8 @@ namespace Umbraco.Core
             composition.RegisterUnique(factory => factory.GetInstance<IUmbracoDatabaseFactory>().SqlContext);
             composition.RegisterUnique(typeLoader);
             composition.RegisterUnique(state);
+            composition.RegisterUnique(typeFinder);
+            composition.RegisterUnique(ioHelper);
         }
     }
 }
diff --git a/src/Umbraco.Core/ContentExtensions.cs b/src/Umbraco.Core/ContentExtensions.cs
index 8e404402d0..6732fd9394 100644
--- a/src/Umbraco.Core/ContentExtensions.cs
+++ b/src/Umbraco.Core/ContentExtensions.cs
@@ -108,7 +108,7 @@ namespace Umbraco.Core
         /// </summary>
         /// <param name="content"></param>
         /// <returns></returns>
-        public static IEnumerable<Property> GetNonGroupedProperties(this IContentBase content)
+        public static IEnumerable<IProperty> GetNonGroupedProperties(this IContentBase content)
         {
             return content.Properties
                 .Where(x => x.PropertyType.PropertyGroupId == null)
@@ -121,7 +121,7 @@ namespace Umbraco.Core
         /// <param name="content"></param>
         /// <param name="propertyGroup"></param>
         /// <returns></returns>
-        public static IEnumerable<Property> GetPropertiesForGroup(this IContentBase content, PropertyGroup propertyGroup)
+        public static IEnumerable<IProperty> GetPropertiesForGroup(this IContentBase content, PropertyGroup propertyGroup)
         {
             //get the properties for the current tab
             return content.Properties
@@ -178,7 +178,7 @@ namespace Umbraco.Core
         }
 
         // gets or creates a property for a content item.
-        private static Property GetProperty(IContentBase content, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, string propertyTypeAlias)
+        private static IProperty GetProperty(IContentBase content, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, string propertyTypeAlias)
         {
             var property = content.Properties.FirstOrDefault(x => x.Alias.InvariantEquals(propertyTypeAlias));
             if (property != null) return property;
diff --git a/src/Umbraco.Core/ContentVariationExtensions.cs b/src/Umbraco.Core/ContentVariationExtensions.cs
index 5b157307ab..bdcf300f3f 100644
--- a/src/Umbraco.Core/ContentVariationExtensions.cs
+++ b/src/Umbraco.Core/ContentVariationExtensions.cs
@@ -50,18 +50,18 @@ namespace Umbraco.Core
         /// Determines whether the property type varies by culture.
         /// </summary>
         /// <remarks>And then it could also vary by segment.</remarks>
-        public static bool VariesByCulture(this PropertyType propertyType) => propertyType.Variations.VariesByCulture();
+        public static bool VariesByCulture(this IPropertyType propertyType) => propertyType.Variations.VariesByCulture();
 
         /// <summary>
         /// Determines whether the property type varies by segment.
         /// </summary>
         /// <remarks>And then it could also vary by culture.</remarks>
-        public static bool VariesBySegment(this PropertyType propertyType) => propertyType.Variations.VariesBySegment();
+        public static bool VariesBySegment(this IPropertyType propertyType) => propertyType.Variations.VariesBySegment();
 
         /// <summary>
         /// Determines whether the property type varies by culture and segment.
         /// </summary>
-        public static bool VariesByCultureAndSegment(this PropertyType propertyType) => propertyType.Variations.VariesByCultureAndSegment();
+        public static bool VariesByCultureAndSegment(this IPropertyType propertyType) => propertyType.Variations.VariesByCultureAndSegment();
 
         /// <summary>
         /// Determines whether the content type is invariant.
@@ -161,13 +161,13 @@ namespace Umbraco.Core
             if (variation.VariesByCulture())
             {
                 // varies by culture
-                // in exact mode, the culture cannot be null                
+                // in exact mode, the culture cannot be null
                 if (exact && culture == null)
                 {
                     if (throwIfInvalid)
                         throw new NotSupportedException($"Culture may not be null because culture variation is enabled.");
                     return false;
-                }    
+                }
             }
             else
             {
@@ -180,7 +180,7 @@ namespace Umbraco.Core
                         throw new NotSupportedException($"Culture \"{culture}\" is invalid because culture variation is disabled.");
                     return false;
                 }
-            }          
+            }
 
             // if it does not vary by segment
             // the segment cannot have a value
diff --git a/src/Umbraco.Core/IO/IMediaFileSystem.cs b/src/Umbraco.Core/IO/IMediaFileSystem.cs
index ed88516135..8ed0ba60ca 100644
--- a/src/Umbraco.Core/IO/IMediaFileSystem.cs
+++ b/src/Umbraco.Core/IO/IMediaFileSystem.cs
@@ -52,7 +52,7 @@ namespace Umbraco.Core.IO
         /// <para>If an <paramref name="oldpath"/> is provided then that file (and associated thumbnails if any) is deleted
         /// before the new file is saved, and depending on the media path scheme, the folder may be reused for the new file.</para>
         /// </remarks>
-        string StoreFile(IContentBase content, PropertyType propertyType, string filename, Stream filestream, string oldpath);
+        string StoreFile(IContentBase content, IPropertyType propertyType, string filename, Stream filestream, string oldpath);
 
         /// <summary>
         /// Copies a media file as a new media file, associated to a property of a content item.
@@ -61,6 +61,6 @@ namespace Umbraco.Core.IO
         /// <param name="propertyType">The property type owning the copy of the media file.</param>
         /// <param name="sourcepath">The filesystem-relative path to the source media file.</param>
         /// <returns>The filesystem-relative path to the copy of the media file.</returns>
-        string CopyFile(IContentBase content, PropertyType propertyType, string sourcepath);
+        string CopyFile(IContentBase content, IPropertyType propertyType, string sourcepath);
     }
 }
diff --git a/src/Umbraco.Core/IO/IOHelper.cs b/src/Umbraco.Core/IO/IOHelper.cs
index a81c0ab559..36215b267c 100644
--- a/src/Umbraco.Core/IO/IOHelper.cs
+++ b/src/Umbraco.Core/IO/IOHelper.cs
@@ -13,6 +13,8 @@ namespace Umbraco.Core.IO
 {
     public class IOHelper : IIOHelper
     {
+        internal static IIOHelper Default { get; } = new IOHelper();
+
         /// <summary>
         /// Gets or sets a value forcing Umbraco to consider it is non-hosted.
         /// </summary>
diff --git a/src/Umbraco.Core/IO/MediaFileSystem.cs b/src/Umbraco.Core/IO/MediaFileSystem.cs
index 2de7bc2f81..edcbfadf0d 100644
--- a/src/Umbraco.Core/IO/MediaFileSystem.cs
+++ b/src/Umbraco.Core/IO/MediaFileSystem.cs
@@ -88,7 +88,7 @@ namespace Umbraco.Core.IO
         #region Associated Media Files
 
         /// <inheritoc />
-        public string StoreFile(IContentBase content, PropertyType propertyType, string filename, Stream filestream, string oldpath)
+        public string StoreFile(IContentBase content, IPropertyType propertyType, string filename, Stream filestream, string oldpath)
         {
             if (content == null) throw new ArgumentNullException(nameof(content));
             if (propertyType == null) throw new ArgumentNullException(nameof(propertyType));
@@ -107,7 +107,7 @@ namespace Umbraco.Core.IO
         }
 
         /// <inheritoc />
-        public string CopyFile(IContentBase content, PropertyType propertyType, string sourcepath)
+        public string CopyFile(IContentBase content, IPropertyType propertyType, string sourcepath)
         {
             if (content == null) throw new ArgumentNullException(nameof(content));
             if (propertyType == null) throw new ArgumentNullException(nameof(propertyType));
diff --git a/src/Umbraco.Core/Manifest/DataEditorConverter.cs b/src/Umbraco.Core/Manifest/DataEditorConverter.cs
index 86982e17f2..437d1eb159 100644
--- a/src/Umbraco.Core/Manifest/DataEditorConverter.cs
+++ b/src/Umbraco.Core/Manifest/DataEditorConverter.cs
@@ -1,9 +1,12 @@
 using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using Umbraco.Core.Composing;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Serialization;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Core.Manifest
 {
@@ -13,13 +16,19 @@ namespace Umbraco.Core.Manifest
     internal class DataEditorConverter : JsonReadConverter<IDataEditor>
     {
         private readonly ILogger _logger;
+        private readonly IIOHelper _ioHelper;
+        private readonly IDataTypeService _dataTypeService;
+        private readonly ILocalizationService _localizationService;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DataEditorConverter"/> class.
         /// </summary>
-        public DataEditorConverter(ILogger logger)
+        public DataEditorConverter(ILogger logger, IIOHelper ioHelper, IDataTypeService dataTypeService, ILocalizationService localizationService)
         {
             _logger = logger;
+            _ioHelper = ioHelper;
+            _dataTypeService = dataTypeService;
+            _localizationService = localizationService;
         }
 
         /// <inheritdoc />
@@ -62,11 +71,11 @@ namespace Umbraco.Core.Manifest
                 PrepareForPropertyEditor(jobject, dataEditor);
             else
                 PrepareForParameterEditor(jobject, dataEditor);
- 
+
             base.Deserialize(jobject, target, serializer);
         }
 
-        private static void PrepareForPropertyEditor(JObject jobject, DataEditor target)
+        private void PrepareForPropertyEditor(JObject jobject, DataEditor target)
         {
             if (jobject["editor"] == null)
                 throw new InvalidOperationException("Missing 'editor' value.");
@@ -74,7 +83,7 @@ namespace Umbraco.Core.Manifest
             // explicitly assign a value editor of type ValueEditor
             // (else the deserializer will try to read it before setting it)
             // (and besides it's an interface)
-            target.ExplicitValueEditor = new DataValueEditor();
+            target.ExplicitValueEditor = new DataValueEditor(_dataTypeService, _localizationService);
 
             // in the manifest, validators are a simple dictionary eg
             // {
@@ -86,6 +95,9 @@ namespace Umbraco.Core.Manifest
             if (jobject["editor"]["validation"] is JObject validation)
                 jobject["editor"]["validation"] = RewriteValidators(validation);
 
+            if(jobject["editor"]["view"] is JValue view)
+                jobject["editor"]["view"] = RewriteVirtualUrl(view);
+
             if (jobject["prevalues"] is JObject config)
             {
                 // explicitly assign a configuration editor of type ConfigurationEditor
@@ -100,6 +112,9 @@ namespace Umbraco.Core.Manifest
                     {
                         if (field["validation"] is JObject fvalidation)
                             field["validation"] = RewriteValidators(fvalidation);
+
+                        if(field["view"] is JValue fview)
+                            field["view"] = RewriteVirtualUrl(fview);
                     }
                 }
 
@@ -118,7 +133,12 @@ namespace Umbraco.Core.Manifest
             }
         }
 
-        private static void PrepareForParameterEditor(JObject jobject, DataEditor target)
+        private string RewriteVirtualUrl(JValue view)
+        {
+            return _ioHelper.ResolveVirtualUrl(view.Value as string);
+        }
+
+        private void PrepareForParameterEditor(JObject jobject, DataEditor target)
         {
             // in a manifest, a parameter editor looks like:
             //
@@ -135,7 +155,7 @@ namespace Umbraco.Core.Manifest
             if (jobject.Property("view") != null)
             {
                 // explicitly assign a value editor of type ParameterValueEditor
-                target.ExplicitValueEditor = new DataValueEditor();
+                target.ExplicitValueEditor = new DataValueEditor(_dataTypeService, _localizationService);
 
                 // move the 'view' property
                 jobject["editor"] = new JObject { ["view"] = jobject["view"] };
@@ -148,6 +168,9 @@ namespace Umbraco.Core.Manifest
                 jobject["defaultConfig"] = config;
                 jobject.Remove("config");
             }
+
+            if(jobject["editor"]?["view"] is JValue view) // We need to null check, if view do not exists, then editor do not exists
+                jobject["editor"]["view"] = RewriteVirtualUrl(view);
         }
 
         private static JArray RewriteValidators(JObject validation)
diff --git a/src/Umbraco.Core/Manifest/ManifestContentAppFactory.cs b/src/Umbraco.Core/Manifest/ManifestContentAppFactory.cs
index 1c50a4b895..e2c3ee48fa 100644
--- a/src/Umbraco.Core/Manifest/ManifestContentAppFactory.cs
+++ b/src/Umbraco.Core/Manifest/ManifestContentAppFactory.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
+using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.ContentEditing;
 using Umbraco.Core.Models.Membership;
@@ -31,10 +32,12 @@ namespace Umbraco.Core.Manifest
     public class ManifestContentAppFactory : IContentAppFactory
     {
         private readonly ManifestContentAppDefinition _definition;
+        private readonly IIOHelper _ioHelper;
 
-        public ManifestContentAppFactory(ManifestContentAppDefinition definition)
+        public ManifestContentAppFactory(ManifestContentAppDefinition definition, IIOHelper ioHelper)
         {
             _definition = definition;
+            _ioHelper = ioHelper;
         }
 
         private ContentApp _app;
@@ -132,7 +135,7 @@ namespace Umbraco.Core.Manifest
                 Alias = _definition.Alias,
                 Name = _definition.Name,
                 Icon = _definition.Icon,
-                View = _definition.View,
+                View = _ioHelper.ResolveVirtualUrl(_definition.View),
                 Weight = _definition.Weight
             });
         }
diff --git a/src/Umbraco.Core/Manifest/ManifestDashboard.cs b/src/Umbraco.Core/Manifest/ManifestDashboard.cs
deleted file mode 100644
index 33af12e3cd..0000000000
--- a/src/Umbraco.Core/Manifest/ManifestDashboard.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.ComponentModel;
-using Newtonsoft.Json;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Dashboards;
-using Umbraco.Core.IO;
-
-namespace Umbraco.Core.Manifest
-{
-    public class ManifestDashboard : IDashboard
-    {
-        private string _view;
-
-        [JsonProperty("alias", Required = Required.Always)]
-        public string Alias { get; set; }
-
-        [JsonProperty("weight", DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate)]
-        [DefaultValue(100)] // must be equal to DashboardCollectionBuilder.DefaultWeight
-        public int Weight { get; set; }
-
-        [JsonProperty("view", Required = Required.Always)]
-        public string View
-        {
-            get => _view;
-            set => _view = Current.IOHelper.ResolveVirtualUrl(value);
-        }
-
-        [JsonProperty("sections")]
-        public string[] Sections { get; set; } = Array.Empty<string>();
-
-        [JsonProperty("access")]
-        public IAccessRule[] AccessRules { get; set; } = Array.Empty<IAccessRule>();
-    }
-}
diff --git a/src/Umbraco.Core/Manifest/ManifestParser.cs b/src/Umbraco.Core/Manifest/ManifestParser.cs
index c3251da7f5..75fdde487c 100644
--- a/src/Umbraco.Core/Manifest/ManifestParser.cs
+++ b/src/Umbraco.Core/Manifest/ManifestParser.cs
@@ -5,11 +5,12 @@ using System.Linq;
 using System.Text;
 using Newtonsoft.Json;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Configuration.Grid;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Serialization;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Core.Manifest
 {
@@ -18,11 +19,14 @@ namespace Umbraco.Core.Manifest
     /// </summary>
     public class ManifestParser : IManifestParser
     {
+        private readonly IJsonSerializer _jsonSerializer;
         private static readonly string Utf8Preamble = Encoding.UTF8.GetString(Encoding.UTF8.GetPreamble());
 
         private readonly IAppPolicyCache _cache;
         private readonly ILogger _logger;
         private readonly IIOHelper _ioHelper;
+        private readonly IDataTypeService _dataTypeService;
+        private readonly ILocalizationService _localizationService;
         private readonly ManifestValueValidatorCollection _validators;
         private readonly ManifestFilterCollection _filters;
 
@@ -31,21 +35,26 @@ namespace Umbraco.Core.Manifest
         /// <summary>
         /// Initializes a new instance of the <see cref="ManifestParser"/> class.
         /// </summary>
-        public ManifestParser(AppCaches appCaches, ManifestValueValidatorCollection validators, ManifestFilterCollection filters, ILogger logger, IIOHelper ioHelper)
-            : this(appCaches, validators, filters, SystemDirectories.AppPlugins, logger, ioHelper)
-        { }
+        public ManifestParser(AppCaches appCaches, ManifestValueValidatorCollection validators, ManifestFilterCollection filters, ILogger logger, IIOHelper ioHelper, IDataTypeService dataTypeService, ILocalizationService localizationService, IJsonSerializer jsonSerializer)
+            : this(appCaches, validators, filters, "~/App_Plugins", logger, ioHelper, dataTypeService, localizationService)
+        {
+            _jsonSerializer = jsonSerializer;
+        }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ManifestParser"/> class.
         /// </summary>
-        private ManifestParser(AppCaches appCaches, ManifestValueValidatorCollection validators, ManifestFilterCollection filters, string path, ILogger logger, IIOHelper ioHelper)
+        private ManifestParser(AppCaches appCaches, ManifestValueValidatorCollection validators, ManifestFilterCollection filters, string path, ILogger logger, IIOHelper ioHelper, IDataTypeService dataTypeService, ILocalizationService localizationService)
         {
             if (appCaches == null) throw new ArgumentNullException(nameof(appCaches));
             _cache = appCaches.RuntimeCache;
+            _ioHelper = ioHelper;
+            _dataTypeService = dataTypeService;
+            _localizationService = localizationService;
             _validators = validators ?? throw new ArgumentNullException(nameof(validators));
             _filters = filters ?? throw new ArgumentNullException(nameof(filters));
             if (string.IsNullOrWhiteSpace(path)) throw new ArgumentNullOrEmptyException(nameof(path));
-            _ioHelper = ioHelper;
+
             Path = path;
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
 
@@ -61,8 +70,8 @@ namespace Umbraco.Core.Manifest
         /// Gets all manifests, merged into a single manifest object.
         /// </summary>
         /// <returns></returns>
-        public IPackageManifest Manifest
-            => _cache.GetCacheItem<IPackageManifest>("Umbraco.Core.Manifest.ManifestParser::Manifests", () =>
+        public PackageManifest Manifest
+            => _cache.GetCacheItem<PackageManifest>("Umbraco.Core.Manifest.ManifestParser::Manifests", () =>
             {
                 var manifests = GetManifests();
                 return MergeManifests(manifests);
@@ -71,9 +80,9 @@ namespace Umbraco.Core.Manifest
         /// <summary>
         /// Gets all manifests.
         /// </summary>
-        private IEnumerable<IPackageManifest> GetManifests()
+        private IEnumerable<PackageManifest> GetManifests()
         {
-            var manifests = new List<IPackageManifest>();
+            var manifests = new List<PackageManifest>();
 
             foreach (var path in GetManifestFiles())
             {
@@ -101,7 +110,7 @@ namespace Umbraco.Core.Manifest
         /// <summary>
         /// Merges all manifests into one.
         /// </summary>
-        private static IPackageManifest MergeManifests(IEnumerable<IPackageManifest> manifests)
+        private static PackageManifest MergeManifests(IEnumerable<PackageManifest> manifests)
         {
             var scripts = new HashSet<string>();
             var stylesheets = new HashSet<string>();
@@ -157,13 +166,13 @@ namespace Umbraco.Core.Manifest
         /// <summary>
         /// Parses a manifest.
         /// </summary>
-        public IPackageManifest ParseManifest(string text)
+        public PackageManifest ParseManifest(string text)
         {
             if (string.IsNullOrWhiteSpace(text))
                 throw new ArgumentNullOrEmptyException(nameof(text));
 
             var manifest = JsonConvert.DeserializeObject<PackageManifest>(text,
-                new DataEditorConverter(_logger),
+                new DataEditorConverter(_logger, _ioHelper, _dataTypeService, _localizationService),
                 new ValueValidatorConverter(_validators),
                 new DashboardAccessRuleConverter());
 
@@ -172,6 +181,19 @@ namespace Umbraco.Core.Manifest
                 manifest.Scripts[i] = _ioHelper.ResolveVirtualUrl(manifest.Scripts[i]);
             for (var i = 0; i < manifest.Stylesheets.Length; i++)
                 manifest.Stylesheets[i] = _ioHelper.ResolveVirtualUrl(manifest.Stylesheets[i]);
+            foreach (var contentApp in manifest.ContentApps)
+            {
+                contentApp.View = _ioHelper.ResolveVirtualUrl(contentApp.View);
+            }
+            foreach (var dashboard in manifest.Dashboards)
+            {
+                dashboard.View = _ioHelper.ResolveVirtualUrl(dashboard.View);
+            }
+            foreach (var gridEditor in manifest.GridEditors)
+            {
+                gridEditor.View = _ioHelper.ResolveVirtualUrl(gridEditor.View);
+                gridEditor.Render = _ioHelper.ResolveVirtualUrl(gridEditor.Render);
+            }
 
             // add property editors that are also parameter editors, to the parameter editors list
             // (the manifest format is kinda legacy)
@@ -183,9 +205,9 @@ namespace Umbraco.Core.Manifest
         }
 
         // purely for tests
-        public IEnumerable<IGridEditorConfig> ParseGridEditors(string text)
+        public IEnumerable<GridEditor> ParseGridEditors(string text)
         {
-            return JsonConvert.DeserializeObject<IEnumerable<GridEditor>>(text);
+            return _jsonSerializer.Deserialize<IEnumerable<GridEditor>>(text);
         }
     }
 }
diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index fbb68194b7..c87cb0a370 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Core.Models
     {
         private int _contentTypeId;
         private int _writerId;
-        private PropertyCollection _properties;
+        private IPropertyCollection _properties;
         private ContentCultureInfosCollection _cultureInfos;
         internal IReadOnlyList<PropertyType> AllPropertyTypes { get; }
 
@@ -135,7 +135,7 @@ namespace Umbraco.Core.Models
         /// </remarks>
         [DataMember]
         [DoNotClone]
-        public PropertyCollection Properties
+        public IPropertyCollection Properties
         {
             get => _properties;
             set
@@ -490,7 +490,7 @@ namespace Umbraco.Core.Models
             if (clonedContent._properties != null)
             {
                 clonedContent._properties.CollectionChanged -= PropertiesChanged;         //clear this event handler if any
-                clonedContent._properties = (PropertyCollection)_properties.DeepClone(); //manually deep clone
+                clonedContent._properties = (IPropertyCollection)_properties.DeepClone(); //manually deep clone
                 clonedContent._properties.CollectionChanged += clonedContent.PropertiesChanged;   //re-assign correct event handler
             }
 
diff --git a/src/Umbraco.Core/Models/ContentTagsExtensions.cs b/src/Umbraco.Core/Models/ContentTagsExtensions.cs
index dd7a716520..7f9c012722 100644
--- a/src/Umbraco.Core/Models/ContentTagsExtensions.cs
+++ b/src/Umbraco.Core/Models/ContentTagsExtensions.cs
@@ -34,7 +34,7 @@ namespace Umbraco.Core.Models
         }
 
         // gets and validates the property
-        private static Property GetTagProperty(this IContentBase content, string propertyTypeAlias)
+        private static IProperty GetTagProperty(this IContentBase content, string propertyTypeAlias)
         {
             if (content == null) throw new ArgumentNullException(nameof(content));
 
diff --git a/src/Umbraco.Core/Models/Identity/UserLoginInfoWrapper.cs b/src/Umbraco.Core/Models/Identity/UserLoginInfoWrapper.cs
new file mode 100644
index 0000000000..926d919ca9
--- /dev/null
+++ b/src/Umbraco.Core/Models/Identity/UserLoginInfoWrapper.cs
@@ -0,0 +1,28 @@
+using Microsoft.AspNet.Identity;
+
+namespace Umbraco.Core.Models.Identity
+{
+    internal class UserLoginInfoWrapper : IUserLoginInfo
+    {
+        private readonly UserLoginInfo _info;
+
+        public static IUserLoginInfo Wrap(UserLoginInfo info) => new UserLoginInfoWrapper(info);
+
+        private UserLoginInfoWrapper(UserLoginInfo info)
+        {
+            _info = info;
+        }
+
+        public string LoginProvider
+        {
+            get => _info.LoginProvider;
+            set => _info.LoginProvider = value;
+        }
+
+        public string ProviderKey
+        {
+            get => _info.ProviderKey;
+            set => _info.ProviderKey = value;
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Models/Property.cs b/src/Umbraco.Core/Models/Property.cs
index 76349823ac..9aa9ab4d74 100644
--- a/src/Umbraco.Core/Models/Property.cs
+++ b/src/Umbraco.Core/Models/Property.cs
@@ -13,16 +13,16 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
-    public class Property : EntityBase
+    public class Property : EntityBase, IProperty
     {
         // _values contains all property values, including the invariant-neutral value
-        private List<PropertyValue> _values = new List<PropertyValue>();
+        private List<IPropertyValue> _values = new List<IPropertyValue>();
 
         // _pvalue contains the invariant-neutral property value
-        private PropertyValue _pvalue;
+        private IPropertyValue _pvalue;
 
         // _vvalues contains the (indexed) variant property values
-        private Dictionary<CompositeNStringNStringKey, PropertyValue> _vvalues;
+        private Dictionary<CompositeNStringNStringKey, IPropertyValue> _vvalues;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Property"/> class.
@@ -33,7 +33,7 @@ namespace Umbraco.Core.Models
         /// <summary>
         /// Initializes a new instance of the <see cref="Property"/> class.
         /// </summary>
-        public Property(PropertyType propertyType)
+        public Property(IPropertyType propertyType)
         {
             PropertyType = propertyType;
         }
@@ -41,7 +41,7 @@ namespace Umbraco.Core.Models
         /// <summary>
         /// Initializes a new instance of the <see cref="Property"/> class.
         /// </summary>
-        public Property(int id, PropertyType propertyType)
+        public Property(int id, IPropertyType propertyType)
         {
             Id = id;
             PropertyType = propertyType;
@@ -50,7 +50,7 @@ namespace Umbraco.Core.Models
         /// <summary>
         /// Represents a property value.
         /// </summary>
-        public class PropertyValue
+        public class PropertyValue : IPropertyValue
         {
             // TODO: Either we allow change tracking at this class level, or we add some special change tracking collections to the Property
             // class to deal with change tracking which variants have changed
@@ -66,7 +66,7 @@ namespace Umbraco.Core.Models
             public string Culture
             {
                 get => _culture;
-                internal set => _culture = value.IsNullOrWhiteSpace() ? null : value.ToLowerInvariant();
+                set => _culture = value.IsNullOrWhiteSpace() ? null : value.ToLowerInvariant();
             }
 
             /// <summary>
@@ -77,23 +77,23 @@ namespace Umbraco.Core.Models
             public string Segment
             {
                 get => _segment;
-                internal set => _segment = value?.ToLowerInvariant();
+                set => _segment = value?.ToLowerInvariant();
             }
 
             /// <summary>
             /// Gets or sets the edited value of the property.
             /// </summary>
-            public object EditedValue { get; internal set; }
+            public object EditedValue { get; set; }
 
             /// <summary>
             /// Gets or sets the published value of the property.
             /// </summary>
-            public object PublishedValue { get; internal set; }
+            public object PublishedValue { get; set; }
 
             /// <summary>
             /// Clones the property value.
             /// </summary>
-            public PropertyValue Clone()
+            public IPropertyValue Clone()
                 => new PropertyValue { _culture = _culture, _segment = _segment, PublishedValue = PublishedValue, EditedValue = EditedValue };
         }
 
@@ -121,13 +121,13 @@ namespace Umbraco.Core.Models
         /// Returns the PropertyType, which this Property is based on
         /// </summary>
         [IgnoreDataMember]
-        public PropertyType PropertyType { get; private set; }
+        public IPropertyType PropertyType { get; private set; }
 
         /// <summary>
         /// Gets the list of values.
         /// </summary>
         [DataMember]
-        public IReadOnlyCollection<PropertyValue> Values
+        public IReadOnlyCollection<IPropertyValue> Values
         {
             get => _values;
             set
@@ -152,7 +152,7 @@ namespace Umbraco.Core.Models
         /// Returns the Id of the PropertyType, which this Property is based on
         /// </summary>
         [IgnoreDataMember]
-        internal int PropertyTypeId => PropertyType.Id;
+        public int PropertyTypeId => PropertyType.Id;
 
         /// <summary>
         /// Returns the DatabaseType that the underlaying DataType is using to store its values
@@ -161,7 +161,7 @@ namespace Umbraco.Core.Models
         /// Only used internally when saving the property value.
         /// </remarks>
         [IgnoreDataMember]
-        internal ValueStorageType ValueStorageType => PropertyType.ValueStorageType;
+        public ValueStorageType ValueStorageType => PropertyType.ValueStorageType;
 
         /// <summary>
         /// Gets the value.
@@ -180,7 +180,7 @@ namespace Umbraco.Core.Models
                 : null;
         }
 
-        private object GetPropertyValue(PropertyValue pvalue, bool published)
+        private object GetPropertyValue(IPropertyValue pvalue, bool published)
         {
             if (pvalue == null) return null;
 
@@ -191,7 +191,7 @@ namespace Umbraco.Core.Models
 
         // internal - must be invoked by the content item
         // does *not* validate the value - content item must validate first
-        internal void PublishValues(string culture = "*", string segment = "*")
+        public void PublishValues(string culture = "*", string segment = "*")
         {
             culture = culture.NullOrWhiteSpaceAsNull();
             segment = segment.NullOrWhiteSpaceAsNull();
@@ -216,7 +216,7 @@ namespace Umbraco.Core.Models
         }
 
         // internal - must be invoked by the content item
-        internal void UnpublishValues(string culture = "*", string segment = "*")
+        public void UnpublishValues(string culture = "*", string segment = "*")
         {
             culture = culture.NullOrWhiteSpaceAsNull();
             segment = segment.NullOrWhiteSpaceAsNull();
@@ -240,7 +240,7 @@ namespace Umbraco.Core.Models
                 UnpublishValue(pvalue);
         }
 
-        private void PublishValue(PropertyValue pvalue)
+        private void PublishValue(IPropertyValue pvalue)
         {
             if (pvalue == null) return;
 
@@ -251,7 +251,7 @@ namespace Umbraco.Core.Models
             DetectChanges(pvalue.EditedValue, origValue, nameof(Values), PropertyValueComparer, false);
         }
 
-        private void UnpublishValue(PropertyValue pvalue)
+        private void UnpublishValue(IPropertyValue pvalue)
         {
             if (pvalue == null) return;
 
@@ -294,7 +294,7 @@ namespace Umbraco.Core.Models
                 pvalue.EditedValue = value;
         }
 
-        private (PropertyValue, bool) GetPValue(bool create)
+        private (IPropertyValue, bool) GetPValue(bool create)
         {
             var change = false;
             if (_pvalue == null)
@@ -307,7 +307,7 @@ namespace Umbraco.Core.Models
             return (_pvalue, change);
         }
 
-        private (PropertyValue, bool) GetPValue(string culture, string segment, bool create)
+        private (IPropertyValue, bool) GetPValue(string culture, string segment, bool create)
         {
             if (culture == null && segment == null)
                 return GetPValue(create);
@@ -316,7 +316,7 @@ namespace Umbraco.Core.Models
             if (_vvalues == null)
             {
                 if (!create) return (null, false);
-                _vvalues = new Dictionary<CompositeNStringNStringKey, PropertyValue>();
+                _vvalues = new Dictionary<CompositeNStringNStringKey, IPropertyValue>();
                 change = true;
             }
             var k = new CompositeNStringNStringKey(culture, segment);
diff --git a/src/Umbraco.Core/Models/PropertyCollection.cs b/src/Umbraco.Core/Models/PropertyCollection.cs
index c587a45424..4c4d083692 100644
--- a/src/Umbraco.Core/Models/PropertyCollection.cs
+++ b/src/Umbraco.Core/Models/PropertyCollection.cs
@@ -12,10 +12,10 @@ namespace Umbraco.Core.Models
     /// </summary>
     [Serializable]
     [DataContract(IsReference = true)]
-    public class PropertyCollection : KeyedCollection<string, Property>, INotifyCollectionChanged, IDeepCloneable
+    public class PropertyCollection : KeyedCollection<string, IProperty>, INotifyCollectionChanged, IDeepCloneable, IPropertyCollection
     {
         private readonly object _addLocker = new object();
-        
+
         internal Func<Property, bool> AdditionValidator { get; set; }
 
         /// <summary>
@@ -60,7 +60,7 @@ namespace Umbraco.Core.Models
         /// <summary>
         /// Replaces the property at the specified index with the specified property.
         /// </summary>
-        protected override void SetItem(int index, Property property)
+        protected override void SetItem(int index, IProperty property)
         {
             var oldItem = index >= 0 ? this[index] : property;
             base.SetItem(index, property);
@@ -80,7 +80,7 @@ namespace Umbraco.Core.Models
         /// <summary>
         /// Inserts the specified property at the specified index.
         /// </summary>
-        protected override void InsertItem(int index, Property property)
+        protected override void InsertItem(int index, IProperty property)
         {
             base.InsertItem(index, property);
             OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, property));
@@ -98,7 +98,7 @@ namespace Umbraco.Core.Models
         /// <summary>
         /// Adds or updates a property.
         /// </summary>
-        internal new void Add(Property property)
+        public new void Add(IProperty property)
         {
             lock (_addLocker) // TODO: why are we locking here and not everywhere else?!
             {
@@ -141,7 +141,7 @@ namespace Umbraco.Core.Models
             return -1;
         }
 
-        protected override string GetKeyForItem(Property item)
+        protected override string GetKeyForItem(IProperty item)
         {
             return item.Alias;
         }
@@ -149,7 +149,7 @@ namespace Umbraco.Core.Models
         /// <summary>
         /// Gets the property with the specified PropertyType.
         /// </summary>
-        internal Property this[PropertyType propertyType]
+        internal IProperty this[IPropertyType propertyType]
         {
             get
             {
@@ -157,7 +157,7 @@ namespace Umbraco.Core.Models
             }
         }
 
-        public bool TryGetValue(string propertyTypeAlias, out Property property)
+        public bool TryGetValue(string propertyTypeAlias, out IProperty property)
         {
             property = this.FirstOrDefault(x => x.Alias.InvariantEquals(propertyTypeAlias));
             return property != null;
@@ -176,7 +176,7 @@ namespace Umbraco.Core.Models
         /// <summary>
         /// Ensures that the collection contains properties for the specified property types.
         /// </summary>
-        protected internal void EnsurePropertyTypes(IEnumerable<PropertyType> propertyTypes)
+        public void EnsurePropertyTypes(IEnumerable<IPropertyType> propertyTypes)
         {
             if (propertyTypes == null)
                 return;
@@ -188,7 +188,7 @@ namespace Umbraco.Core.Models
         /// <summary>
         /// Ensures that the collection does not contain properties not in the specified property types.
         /// </summary>
-        protected internal void EnsureCleanPropertyTypes(IEnumerable<PropertyType> propertyTypes)
+        public void EnsureCleanPropertyTypes(IEnumerable<IPropertyType> propertyTypes)
         {
             if (propertyTypes == null)
                 return;
diff --git a/src/Umbraco.Core/Models/PropertyTagsExtensions.cs b/src/Umbraco.Core/Models/PropertyTagsExtensions.cs
index 63cf870221..1bac5c98f1 100644
--- a/src/Umbraco.Core/Models/PropertyTagsExtensions.cs
+++ b/src/Umbraco.Core/Models/PropertyTagsExtensions.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Core.Models
 
         // gets the tag configuration for a property
         // from the datatype configuration, and the editor tag configuration attribute
-        internal static TagConfiguration GetTagConfiguration(this Property property)
+        internal static TagConfiguration GetTagConfiguration(this IProperty property)
         {
             if (property == null) throw new ArgumentNullException(nameof(property));
 
@@ -44,7 +44,7 @@ namespace Umbraco.Core.Models
         /// <param name="tags">The tags.</param>
         /// <param name="merge">A value indicating whether to merge the tags with existing tags instead of replacing them.</param>
         /// <param name="culture">A culture, for multi-lingual properties.</param>
-        public static void AssignTags(this Property property, IEnumerable<string> tags, bool merge = false, string culture = null)
+        public static void AssignTags(this IProperty property, IEnumerable<string> tags, bool merge = false, string culture = null)
         {
             if (property == null) throw new ArgumentNullException(nameof(property));
 
@@ -56,7 +56,7 @@ namespace Umbraco.Core.Models
         }
 
         // assumes that parameters are consistent with the datatype configuration
-        private static void AssignTags(this Property property, IEnumerable<string> tags, bool merge, TagsStorageType storageType, char delimiter, string culture)
+        private static void AssignTags(this IProperty property, IEnumerable<string> tags, bool merge, TagsStorageType storageType, char delimiter, string culture)
         {
             // set the property value
             var trimmedTags = tags.Select(x => x.Trim()).ToArray();
@@ -97,7 +97,7 @@ namespace Umbraco.Core.Models
         /// <param name="property">The property.</param>
         /// <param name="tags">The tags.</param>
         /// <param name="culture">A culture, for multi-lingual properties.</param>
-        public static void RemoveTags(this Property property, IEnumerable<string> tags, string culture = null)
+        public static void RemoveTags(this IProperty property, IEnumerable<string> tags, string culture = null)
         {
             if (property == null) throw new ArgumentNullException(nameof(property));
 
@@ -109,7 +109,7 @@ namespace Umbraco.Core.Models
         }
 
         // assumes that parameters are consistent with the datatype configuration
-        private static void RemoveTags(this Property property, IEnumerable<string> tags, TagsStorageType storageType, char delimiter, string culture)
+        private static void RemoveTags(this IProperty property, IEnumerable<string> tags, TagsStorageType storageType, char delimiter, string culture)
         {
             // already empty = nothing to do
             var value = property.GetValue(culture)?.ToString();
@@ -131,7 +131,7 @@ namespace Umbraco.Core.Models
         }
 
         // used by ContentRepositoryBase
-        internal static IEnumerable<string> GetTagsValue(this Property property, string culture = null)
+        internal static IEnumerable<string> GetTagsValue(this IProperty property, string culture = null)
         {
             if (property == null) throw new ArgumentNullException(nameof(property));
 
@@ -142,7 +142,7 @@ namespace Umbraco.Core.Models
             return property.GetTagsValue(configuration.StorageType, configuration.Delimiter, culture);
         }
 
-        private static IEnumerable<string> GetTagsValue(this Property property, TagsStorageType storageType, char delimiter, string culture = null)
+        private static IEnumerable<string> GetTagsValue(this IProperty property, TagsStorageType storageType, char delimiter, string culture = null)
         {
             if (property == null) throw new ArgumentNullException(nameof(property));
 
@@ -182,7 +182,7 @@ namespace Umbraco.Core.Models
         /// <para>This is used both by the content repositories to initialize a property with some tag values, and by the
         /// content controllers to update a property with values received from the property editor.</para>
         /// </remarks>
-        internal static void SetTagsValue(this Property property, object value, TagConfiguration tagConfiguration, string culture)
+        internal static void SetTagsValue(this IProperty property, object value, TagConfiguration tagConfiguration, string culture)
         {
             if (property == null) throw new ArgumentNullException(nameof(property));
             if (tagConfiguration == null) throw new ArgumentNullException(nameof(tagConfiguration));
@@ -195,7 +195,7 @@ namespace Umbraco.Core.Models
 
         // assumes that parameters are consistent with the datatype configuration
         // value can be an enumeration of string, or a serialized value using storageType format
-        private static void SetTagsValue(Property property, object value, TagsStorageType storageType, char delimiter, string culture)
+        private static void SetTagsValue(IProperty property, object value, TagsStorageType storageType, char delimiter, string culture)
         {
             if (value == null) value = Enumerable.Empty<string>();
 
diff --git a/src/Umbraco.Core/Models/PropertyType.cs b/src/Umbraco.Core/Models/PropertyType.cs
index 40af478ab8..1448e099be 100644
--- a/src/Umbraco.Core/Models/PropertyType.cs
+++ b/src/Umbraco.Core/Models/PropertyType.cs
@@ -13,7 +13,7 @@ namespace Umbraco.Core.Models
     [Serializable]
     [DataContract(IsReference = true)]
     [DebuggerDisplay("Id: {Id}, Name: {Name}, Alias: {Alias}")]
-    public class PropertyType : EntityBase, IEquatable<PropertyType>
+    public class PropertyType : EntityBase, IPropertyType, IEquatable<PropertyType>
     {
         private readonly bool _forceValueStorageType;
         private string _name;
@@ -160,7 +160,7 @@ namespace Umbraco.Core.Models
         /// Gets or sets the database type for storing value for this property type.
         /// </summary>
         [DataMember]
-        internal ValueStorageType ValueStorageType
+        public ValueStorageType ValueStorageType
         {
             get => _valueStorageType;
             set
@@ -175,7 +175,7 @@ namespace Umbraco.Core.Models
         /// </summary>
         /// <remarks>For generic properties, the value is <c>null</c>.</remarks>
         [DataMember]
-        internal Lazy<int> PropertyGroupId
+        public Lazy<int> PropertyGroupId
         {
             get => _propertyGroupId;
             set => SetPropertyValueAndDetectChanges(value, ref _propertyGroupId, nameof(PropertyGroupId));
diff --git a/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs b/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs
index 9d9482fedb..fc31f61763 100644
--- a/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/PropertyFactory.cs
@@ -46,7 +46,7 @@ namespace Umbraco.Core.Persistence.Factories
             return properties;
         }
 
-        private static PropertyDataDto BuildDto(int versionId, Property property, int? languageId, string segment, object value)
+        private static PropertyDataDto BuildDto(int versionId, IProperty property, int? languageId, string segment, object value)
         {
             var dto = new PropertyDataDto { VersionId = versionId, PropertyTypeId = property.PropertyTypeId };
 
@@ -109,7 +109,7 @@ namespace Umbraco.Core.Persistence.Factories
         /// The value of this will be used to populate the edited cultures in the umbracoDocumentCultureVariation table.
         /// </param>
         /// <returns></returns>
-        public static IEnumerable<PropertyDataDto> BuildDtos(ContentVariation contentVariation, int currentVersionId, int publishedVersionId, IEnumerable<Property> properties,
+        public static IEnumerable<PropertyDataDto> BuildDtos(ContentVariation contentVariation, int currentVersionId, int publishedVersionId, IEnumerable<IProperty> properties,
             ILanguageRepository languageRepository, out bool edited,
             out HashSet<string> editedCultures)
         {
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ExternalLoginRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ExternalLoginRepository.cs
index f708590ea8..bb1bd29a8a 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ExternalLoginRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ExternalLoginRepository.cs
@@ -25,7 +25,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             Database.Execute("DELETE FROM ExternalLogins WHERE UserId=@userId", new { userId = memberId });
         }
 
-        public void SaveUserLogins(int memberId, IEnumerable<UserLoginInfo> logins)
+        public void SaveUserLogins(int memberId, IEnumerable<IUserLoginInfo> logins)
         {
             //clear out logins for member
             Database.Execute("DELETE FROM umbracoExternalLogin WHERE userId=@userId", new { userId = memberId });
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ScriptRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ScriptRepository.cs
index 3196332a86..491dafe577 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ScriptRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ScriptRepository.cs
@@ -12,19 +12,19 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
     /// <summary>
     /// Represents the Script Repository
     /// </summary>
-    internal class ScriptRepository : FileRepository<string, Script>, IScriptRepository
+    internal class ScriptRepository : FileRepository<string, IScript>, IScriptRepository
     {
-        private readonly IContentSection _contentConfig;
+        private readonly IIOHelper _ioHelper;
 
-        public ScriptRepository(IFileSystems fileSystems, IContentSection contentConfig)
+        public ScriptRepository(IFileSystems fileSystems, IIOHelper ioHelper)
             : base(fileSystems.ScriptsFileSystem)
         {
-            _contentConfig = contentConfig ?? throw new ArgumentNullException(nameof(contentConfig));
+            _ioHelper = ioHelper ?? throw new ArgumentNullException(nameof(ioHelper));
         }
 
         #region Implementation of IRepository<string,Script>
 
-        public override Script Get(string id)
+        public override IScript Get(string id)
         {
             // get the relative path within the filesystem
             // (though... id should be relative already)
@@ -55,16 +55,19 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             return script;
         }
 
-        public override void Save(Script entity)
+        public override void Save(IScript entity)
         {
-            base.Save(entity);
+            // TODO: Casting :/ Review GetFileContent and it's usages, need to look into it later
+            var script = (Script) entity;
+
+            base.Save(script);
 
             // ensure that from now on, content is lazy-loaded
-            if (entity.GetFileContent == null)
-                entity.GetFileContent = file => GetFileContent(file.OriginalPath);
+            if (script.GetFileContent == null)
+                script.GetFileContent = file => GetFileContent(file.OriginalPath);
         }
 
-        public override IEnumerable<Script> GetMany(params string[] ids)
+        public override IEnumerable<IScript> GetMany(params string[] ids)
         {
             //ensure they are de-duplicated, easy win if people don't do this as this can cause many excess queries
             ids = ids.Distinct().ToArray();
@@ -86,7 +89,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             }
         }
 
-        public bool ValidateScript(Script script)
+        public bool ValidateScript(IScript script)
         {
             // get full path
             string fullPath;
@@ -102,9 +105,9 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
             // validate path & extension
             var validDir = SystemDirectories.Scripts;
-            var isValidPath = Current.IOHelper.VerifyEditPath(fullPath, validDir);
+            var isValidPath = _ioHelper.VerifyEditPath(fullPath, validDir);
             var validExts = new[] {"js"};
-            var isValidExtension = Current.IOHelper.VerifyFileExtension(script.Path, validExts);
+            var isValidExtension = _ioHelper.VerifyFileExtension(script.Path, validExts);
             return isValidPath && isValidExtension;
         }
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/StylesheetRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/StylesheetRepository.cs
index 52ff14b0dc..94737b5620 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/StylesheetRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/StylesheetRepository.cs
@@ -10,15 +10,19 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
     /// <summary>
     /// Represents the Stylesheet Repository
     /// </summary>
-    internal class StylesheetRepository : FileRepository<string, Stylesheet>, IStylesheetRepository
+    internal class StylesheetRepository : FileRepository<string, IStylesheet>, IStylesheetRepository
     {
-        public StylesheetRepository(IFileSystems fileSystems)
+        private readonly IIOHelper _ioHelper;
+
+        public StylesheetRepository(IFileSystems fileSystems, IIOHelper ioHelper)
             : base(fileSystems.StylesheetsFileSystem)
-        { }
+        {
+            _ioHelper = ioHelper;
+        }
 
         #region Overrides of FileRepository<string,Stylesheet>
 
-        public override Stylesheet Get(string id)
+        public override IStylesheet Get(string id)
         {
             // get the relative path within the filesystem
             // (though... id should be relative already)
@@ -51,16 +55,19 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         }
 
-        public override void Save(Stylesheet entity)
+        public override void Save(IStylesheet entity)
         {
-            base.Save(entity);
+            // TODO: Casting :/ Review GetFileContent and it's usages, need to look into it later
+            var stylesheet = (Stylesheet)entity;
+
+            base.Save(stylesheet);
 
             // ensure that from now on, content is lazy-loaded
-            if (entity.GetFileContent == null)
-                entity.GetFileContent = file => GetFileContent(file.OriginalPath);
+            if (stylesheet.GetFileContent == null)
+                stylesheet.GetFileContent = file => GetFileContent(file.OriginalPath);
         }
 
-        public override IEnumerable<Stylesheet> GetMany(params string[] ids)
+        public override IEnumerable<IStylesheet> GetMany(params string[] ids)
         {
             //ensure they are de-duplicated, easy win if people don't do this as this can cause many excess queries
             ids = ids
@@ -92,14 +99,14 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         /// If null or not specified, will return the stylesheets at the root path relative to the IFileSystem
         /// </param>
         /// <returns></returns>
-        public IEnumerable<Stylesheet> GetStylesheetsAtPath(string rootPath = null)
+        public IEnumerable<IStylesheet> GetStylesheetsAtPath(string rootPath = null)
         {
             return FileSystem.GetFiles(rootPath ?? string.Empty, "*.css").Select(Get);
         }
 
         private static readonly List<string> ValidExtensions = new List<string> { "css" };
 
-        public bool ValidateStylesheet(Stylesheet stylesheet)
+        public bool ValidateStylesheet(IStylesheet stylesheet)
         {
             // get full path
             string fullPath;
@@ -115,8 +122,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
             // validate path and extension
             var validDir = SystemDirectories.Css;
-            var isValidPath = Current.IOHelper.VerifyEditPath(fullPath, validDir);
-            var isValidExtension = Current.IOHelper.VerifyFileExtension(stylesheet.Path, ValidExtensions);
+            var isValidPath = _ioHelper.VerifyEditPath(fullPath, validDir);
+            var isValidExtension = _ioHelper.VerifyFileExtension(stylesheet.Path, ValidExtensions);
             return isValidPath && isValidExtension;
         }
 
diff --git a/src/Umbraco.Core/PropertyEditors/ConfigurationEditorOfTConfiguration.cs b/src/Umbraco.Core/PropertyEditors/ConfigurationEditorOfTConfiguration.cs
index 7008c73433..bee923b50e 100644
--- a/src/Umbraco.Core/PropertyEditors/ConfigurationEditorOfTConfiguration.cs
+++ b/src/Umbraco.Core/PropertyEditors/ConfigurationEditorOfTConfiguration.cs
@@ -35,6 +35,7 @@ namespace Umbraco.Core.PropertyEditors
 
                 ConfigurationField field;
 
+                var attributeView = Current.IOHelper.ResolveVirtualUrl(attribute.View);
                 // if the field does not have its own type, use the base type
                 if (attribute.Type == null)
                 {
@@ -47,7 +48,7 @@ namespace Umbraco.Core.PropertyEditors
                         PropertyType = property.PropertyType,
                         Description = attribute.Description,
                         HideLabel = attribute.HideLabel,
-                        View = attribute.View
+                        View = attributeView
                     };
 
                     fields.Add(field);
@@ -81,7 +82,7 @@ namespace Umbraco.Core.PropertyEditors
                     field.Name = attribute.Name;
 
                 if (!string.IsNullOrWhiteSpace(attribute.View))
-                    field.View = attribute.View;
+                    field.View = attributeView;
 
                 if (!string.IsNullOrWhiteSpace(attribute.Description))
                     field.Description = attribute.Description;
diff --git a/src/Umbraco.Core/PropertyEditors/ConfigurationFieldsExtensions.cs b/src/Umbraco.Core/PropertyEditors/ConfigurationFieldsExtensions.cs
deleted file mode 100644
index 25fba622d5..0000000000
--- a/src/Umbraco.Core/PropertyEditors/ConfigurationFieldsExtensions.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.PropertyEditors
-{
-    public static partial class ConfigurationFieldsExtensions
-    {
-        /// <summary>
-        /// Adds a configuration field.
-        /// </summary>
-        /// <param name="fields">The list of configuration fields.</param>
-        /// <param name="key">The key (alias) of the field.</param>
-        /// <param name="name">The name (label) of the field.</param>
-        /// <param name="description">The description for the field.</param>
-        /// <param name="view">The path to the editor view to be used for the field.</param>
-        /// <param name="config">Optional configuration used for field's editor.</param>
-        public static void Add(
-            this List<ConfigurationField> fields,
-            string key,
-            string name,
-            string description,
-            string view,
-            IDictionary<string, object> config = null)
-        {
-            fields.Add(new ConfigurationField
-            {
-                Key = key,
-                Name = name,
-                Description = description,
-                View = view,
-                Config = config,
-            });
-        }
-    }
-}
diff --git a/src/Umbraco.Core/PropertyEditors/DataEditor.cs b/src/Umbraco.Core/PropertyEditors/DataEditor.cs
index dbb2fc467e..047c0f0683 100644
--- a/src/Umbraco.Core/PropertyEditors/DataEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/DataEditor.cs
@@ -165,7 +165,7 @@ namespace Umbraco.Core.PropertyEditors
             if (Attribute == null)
                 throw new InvalidOperationException("The editor does not specify a view.");
 
-            return new DataValueEditor(Attribute);
+            return new DataValueEditor(Current.Services.DataTypeService, Current.Services.LocalizationService, Attribute);
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs b/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
index a9ce27d964..d93ead5838 100644
--- a/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/DataValueEditor.cs
@@ -7,7 +7,6 @@ using System.Xml.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Umbraco.Core.Composing;
-using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Editors;
@@ -21,32 +20,25 @@ namespace Umbraco.Core.PropertyEditors
     /// </summary>
     public class DataValueEditor : IDataValueEditor
     {
+        protected readonly IDataTypeService _dataTypeService;
+        protected readonly ILocalizationService _localizationService;
         private string _view;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DataValueEditor"/> class.
         /// </summary>
-        public DataValueEditor() // for tests, and manifest
+        public DataValueEditor(IDataTypeService dataTypeService, ILocalizationService localizationService) // for tests, and manifest
         {
             ValueType = ValueTypes.String;
             Validators = new List<IValueValidator>();
+            _dataTypeService = dataTypeService;
+            _localizationService = localizationService;
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DataValueEditor"/> class.
         /// </summary>
-        public DataValueEditor(string view, params IValueValidator[] validators) // not used
-            : this()
-        {
-            View = view;
-            Validators.AddRange(validators);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataValueEditor"/> class.
-        /// </summary>
-        public DataValueEditor(DataEditorAttribute attribute)
-            : this()
+        public DataValueEditor(IDataTypeService dataTypeService, ILocalizationService localizationService, DataEditorAttribute attribute)
         {
             if (attribute == null) throw new ArgumentNullException(nameof(attribute));
 
@@ -57,6 +49,9 @@ namespace Umbraco.Core.PropertyEditors
             View = view;
             ValueType = attribute.ValueType;
             HideLabel = attribute.HideLabel;
+
+            _dataTypeService = dataTypeService;
+            _localizationService = localizationService;
         }
 
         /// <summary>
@@ -72,11 +67,7 @@ namespace Umbraco.Core.PropertyEditors
         /// folder, or (3) a view name which maps to views/propertyeditors/{view}/{view}.html.</para>
         /// </remarks>
         [JsonProperty("view", Required = Required.Always)]
-        public string View
-        {
-            get => _view;
-            set => _view = Current.IOHelper.ResolveVirtualUrl(value);
-        }
+        public string View { get; set; }
 
         /// <summary>
         /// The value type which reflects how it is validated and stored in the database
@@ -115,7 +106,7 @@ namespace Umbraco.Core.PropertyEditors
         /// A collection of validators for the pre value editor
         /// </summary>
         [JsonProperty("validation")]
-        public List<IValueValidator> Validators { get; private set; }
+        public List<IValueValidator> Validators { get; private set; } = new List<IValueValidator>();
 
         /// <summary>
         /// Gets the validator used to validate the special property type -level "required".
@@ -237,7 +228,7 @@ namespace Umbraco.Core.PropertyEditors
         /// The object returned will automatically be serialized into json notation. For most property editors
         /// the value returned is probably just a string but in some cases a json structure will be returned.
         /// </remarks>
-        public virtual object ToEditor(Property property, IDataTypeService dataTypeService, string culture = null, string segment = null)
+        public virtual object ToEditor(IProperty property, string culture = null, string segment = null)
         {
             var val = property.GetValue(culture, segment);
             if (val == null) return string.Empty;
@@ -288,7 +279,7 @@ namespace Umbraco.Core.PropertyEditors
         /// <summary>
         /// Converts a property to Xml fragments.
         /// </summary>
-        public IEnumerable<XElement> ConvertDbToXml(Property property, IDataTypeService dataTypeService, ILocalizationService localizationService, bool published)
+        public IEnumerable<XElement> ConvertDbToXml(IProperty property, bool published)
         {
             published &= property.PropertyType.SupportsPublishing;
 
@@ -306,7 +297,7 @@ namespace Umbraco.Core.PropertyEditors
                 if (pvalue.Segment != null)
                     xElement.Add(new XAttribute("segment", pvalue.Segment));
 
-                var xValue = ConvertDbToXml(property.PropertyType, value, dataTypeService);
+                var xValue = ConvertDbToXml(property.PropertyType, value);
                 xElement.Add(xValue);
 
                 yield return xElement;
@@ -322,12 +313,12 @@ namespace Umbraco.Core.PropertyEditors
         /// <para>Returns an XText or XCData instance which must be wrapped in a element.</para>
         /// <para>If the value is empty we will not return as CDATA since that will just take up more space in the file.</para>
         /// </remarks>
-        public XNode ConvertDbToXml(PropertyType propertyType, object value, IDataTypeService dataTypeService)
+        public XNode ConvertDbToXml(IPropertyType propertyType, object value)
         {
             //check for null or empty value, we don't want to return CDATA if that is the case
             if (value == null || value.ToString().IsNullOrWhiteSpace())
             {
-                return new XText(ConvertDbToString(propertyType, value, dataTypeService));
+                return new XText(ConvertDbToString(propertyType, value));
             }
 
             switch (ValueTypes.ToStorageType(ValueType))
@@ -335,11 +326,11 @@ namespace Umbraco.Core.PropertyEditors
                 case ValueStorageType.Date:
                 case ValueStorageType.Integer:
                 case ValueStorageType.Decimal:
-                    return new XText(ConvertDbToString(propertyType, value, dataTypeService));
+                    return new XText(ConvertDbToString(propertyType, value));
                 case ValueStorageType.Nvarchar:
                 case ValueStorageType.Ntext:
                     //put text in cdata
-                    return new XCData(ConvertDbToString(propertyType, value, dataTypeService));
+                    return new XCData(ConvertDbToString(propertyType, value));
                 default:
                     throw new ArgumentOutOfRangeException();
             }
@@ -348,7 +339,7 @@ namespace Umbraco.Core.PropertyEditors
         /// <summary>
         /// Converts a property value to a string.
         /// </summary>
-        public virtual string ConvertDbToString(PropertyType propertyType, object value, IDataTypeService dataTypeService)
+        public virtual string ConvertDbToString(IPropertyType propertyType, object value)
         {
             if (value == null)
                 return string.Empty;
diff --git a/src/Umbraco.Core/PropertyEditors/DefaultPropertyIndexValueFactory.cs b/src/Umbraco.Core/PropertyEditors/DefaultPropertyIndexValueFactory.cs
index 413f31d79e..0d06b59a9c 100644
--- a/src/Umbraco.Core/PropertyEditors/DefaultPropertyIndexValueFactory.cs
+++ b/src/Umbraco.Core/PropertyEditors/DefaultPropertyIndexValueFactory.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Core.PropertyEditors
     public class DefaultPropertyIndexValueFactory : IPropertyIndexValueFactory
     {
         /// <inheritdoc />
-        public IEnumerable<KeyValuePair<string, IEnumerable<object>>> GetIndexValues(Property property, string culture, string segment, bool published)
+        public IEnumerable<KeyValuePair<string, IEnumerable<object>>> GetIndexValues(IProperty property, string culture, string segment, bool published)
         {
             yield return new KeyValuePair<string, IEnumerable<object>>(
                 property.Alias,
diff --git a/src/Umbraco.Core/PropertyEditors/LabelPropertyEditor.cs b/src/Umbraco.Core/PropertyEditors/LabelPropertyEditor.cs
index 60b7d55c01..e47d35107a 100644
--- a/src/Umbraco.Core/PropertyEditors/LabelPropertyEditor.cs
+++ b/src/Umbraco.Core/PropertyEditors/LabelPropertyEditor.cs
@@ -1,4 +1,6 @@
-using Umbraco.Core.Logging;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Core.PropertyEditors
 {
@@ -20,7 +22,7 @@ namespace Umbraco.Core.PropertyEditors
         { }
 
         /// <inheritdoc />
-        protected override IDataValueEditor CreateValueEditor() => new LabelPropertyValueEditor(Attribute);
+        protected override IDataValueEditor CreateValueEditor() => new LabelPropertyValueEditor(Current.Services.DataTypeService, Current.Services.LocalizationService, Attribute);
 
         /// <inheritdoc />
         protected override IConfigurationEditor CreateConfigurationEditor() => new LabelConfigurationEditor();
@@ -28,8 +30,8 @@ namespace Umbraco.Core.PropertyEditors
         // provides the property value editor
         internal class LabelPropertyValueEditor : DataValueEditor
         {
-            public LabelPropertyValueEditor(DataEditorAttribute attribute)
-                : base(attribute)
+            public LabelPropertyValueEditor(IDataTypeService dataTypeService, ILocalizationService localizationService, DataEditorAttribute attribute)
+                : base(dataTypeService, localizationService, attribute)
             { }
 
             /// <inheritdoc />
diff --git a/src/Umbraco.Core/PropertyEditors/ManifestValueValidatorCollectionBuilder.cs b/src/Umbraco.Core/PropertyEditors/ManifestValueValidatorCollectionBuilder.cs
deleted file mode 100644
index 8f7c68c813..0000000000
--- a/src/Umbraco.Core/PropertyEditors/ManifestValueValidatorCollectionBuilder.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Umbraco.Core.Composing;
-
-namespace Umbraco.Core.PropertyEditors
-{
-    internal class ManifestValueValidatorCollectionBuilder : LazyCollectionBuilderBase<ManifestValueValidatorCollectionBuilder, ManifestValueValidatorCollection, IManifestValueValidator>
-    {
-        protected override ManifestValueValidatorCollectionBuilder This => this;
-    }
-}
diff --git a/src/Umbraco.Core/PropertyEditors/Validators/RegexValidator.cs b/src/Umbraco.Core/PropertyEditors/Validators/RegexValidator.cs
index e405fa3a3e..4036adba42 100644
--- a/src/Umbraco.Core/PropertyEditors/Validators/RegexValidator.cs
+++ b/src/Umbraco.Core/PropertyEditors/Validators/RegexValidator.cs
@@ -11,7 +11,7 @@ namespace Umbraco.Core.PropertyEditors.Validators
     /// <summary>
     /// A validator that validates that the value against a regular expression.
     /// </summary>
-    internal sealed class RegexValidator : IValueFormatValidator, IManifestValueValidator
+    public sealed class RegexValidator : IValueFormatValidator, IManifestValueValidator
     {
         private readonly ILocalizedTextService _textService;
         private string _regex;
diff --git a/src/Umbraco.Core/PropertyEditors/Validators/RequiredValidator.cs b/src/Umbraco.Core/PropertyEditors/Validators/RequiredValidator.cs
index c51f572817..e83997b170 100644
--- a/src/Umbraco.Core/PropertyEditors/Validators/RequiredValidator.cs
+++ b/src/Umbraco.Core/PropertyEditors/Validators/RequiredValidator.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Core.PropertyEditors.Validators
     /// <summary>
     /// A validator that validates that the value is not null or empty (if it is a string)
     /// </summary>
-    internal sealed class RequiredValidator : IValueRequiredValidator, IManifestValueValidator
+    public sealed class RequiredValidator : IValueRequiredValidator, IManifestValueValidator
     {
         private readonly ILocalizedTextService _textService;
 
diff --git a/src/Umbraco.Core/Runtime/CoreRuntime.cs b/src/Umbraco.Core/Runtime/CoreRuntime.cs
index 5c4bfae5b8..6918c16295 100644
--- a/src/Umbraco.Core/Runtime/CoreRuntime.cs
+++ b/src/Umbraco.Core/Runtime/CoreRuntime.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Configuration;
 using System.Diagnostics;
+using System.IO;
 using System.Web;
 using System.Web.Hosting;
 using Umbraco.Core.Cache;
@@ -43,6 +44,16 @@ namespace Umbraco.Core.Runtime
         /// </summary>
         protected IProfilingLogger ProfilingLogger { get; private set; }
 
+        /// <summary>
+        /// Gets the <see cref="ITypeFinder"/>
+        /// </summary>
+        protected ITypeFinder TypeFinder { get; private set; }
+
+        /// <summary>
+        /// Gets the <see cref="IIOHelper"/>
+        /// </summary>
+        protected IIOHelper IOHelper { get; private set; }
+
         /// <inheritdoc />
         public IRuntimeState State => _state;
 
@@ -54,9 +65,22 @@ namespace Umbraco.Core.Runtime
 
             // loggers
             var logger = Logger = GetLogger();
+            if (logger == null)
+                throw new InvalidOperationException($"The object returned from {nameof(GetLogger)} cannot be null");
             var profiler = Profiler = GetProfiler();
+            if (profiler == null)
+                throw new InvalidOperationException($"The object returned from {nameof(GetProfiler)} cannot be null");
+
             var profilingLogger = ProfilingLogger = new ProfilingLogger(logger, profiler);
 
+            IOHelper = GetIOHelper();
+            if (IOHelper == null)
+                throw new InvalidOperationException($"The object returned from {nameof(GetIOHelper)} cannot be null");
+
+            TypeFinder = GetTypeFinder();
+            if (TypeFinder == null)
+                throw new InvalidOperationException($"The object returned from {nameof(GetTypeFinder)} cannot be null");
+
             // the boot loader boots using a container scope, so anything that is PerScope will
             // be disposed after the boot loader has booted, and anything else will remain.
             // note that this REQUIRES that perWebRequestScope has NOT been enabled yet, else
@@ -112,8 +136,8 @@ namespace Umbraco.Core.Runtime
                 // configs
                 var configs = GetConfigs(configsFactory);
 
-                // type loader
-                var typeLoader = new TypeLoader(appCaches.RuntimeCache, configs.Global().LocalTempPath, ProfilingLogger);
+                // type finder/loader
+                var typeLoader = new TypeLoader(IOHelper, TypeFinder, appCaches.RuntimeCache, new DirectoryInfo(configs.Global().LocalTempPath), ProfilingLogger);
 
                 // runtime state
                 // beware! must use '() => _factory.GetInstance<T>()' and NOT '_factory.GetInstance<T>'
@@ -131,7 +155,7 @@ namespace Umbraco.Core.Runtime
 
                 // create the composition
                 composition = new Composition(register, typeLoader, ProfilingLogger, _state, configs);
-                composition.RegisterEssentials(Logger, Profiler, ProfilingLogger, mainDom, appCaches, databaseFactory, typeLoader, _state);
+                composition.RegisterEssentials(Logger, Profiler, ProfilingLogger, mainDom, appCaches, databaseFactory, typeLoader, _state, TypeFinder, IOHelper);
 
                 // run handlers
                 RuntimeOptions.DoRuntimeEssentials(composition, appCaches, typeLoader, databaseFactory);
@@ -153,7 +177,7 @@ namespace Umbraco.Core.Runtime
                 composers.Compose();
 
                 // create the factory
-                _factory = Current.Factory = CurrentCore.Factory = composition.CreateFactory();
+                _factory = Current.Factory = composition.CreateFactory();
 
                 // create & initialize the components
                 _components = _factory.GetInstance<ComponentCollection>();
@@ -178,7 +202,7 @@ namespace Umbraco.Core.Runtime
                 {
                     try
                     {
-                        _factory = Current.Factory = CurrentCore.Factory = composition?.CreateFactory();
+                        _factory = Current.Factory = composition?.CreateFactory();
                     }
                     catch { /* yea */ }
                 }
@@ -289,7 +313,6 @@ namespace Umbraco.Core.Runtime
         /// </summary>
         public virtual void Compose(Composition composition)
         {
-            // nothing
         }
 
         #region Getters
@@ -314,6 +337,20 @@ namespace Umbraco.Core.Runtime
         protected virtual IProfiler GetProfiler()
             => new LogProfiler(Logger);
 
+        /// <summary>
+        /// Gets a <see cref="ITypeFinder"/>
+        /// </summary>
+        /// <returns></returns>
+        protected virtual ITypeFinder GetTypeFinder()
+            => new TypeFinder(Logger);
+
+        /// <summary>
+        /// Gets a <see cref="IIOHelper"/>
+        /// </summary>
+        /// <returns></returns>
+        protected virtual IIOHelper GetIOHelper()
+            => Umbraco.Core.IO.IOHelper.Default;
+
         /// <summary>
         /// Gets the application caches.
         /// </summary>
@@ -324,9 +361,9 @@ namespace Umbraco.Core.Runtime
             // is overridden by the web runtime
 
             return new AppCaches(
-                new DeepCloneAppCache(new ObjectCacheAppCache()),
+                new DeepCloneAppCache(new ObjectCacheAppCache(TypeFinder)),
                 NoAppCache.Instance,
-                new IsolatedCaches(type => new DeepCloneAppCache(new ObjectCacheAppCache())));
+                new IsolatedCaches(type => new DeepCloneAppCache(new ObjectCacheAppCache(TypeFinder))));
         }
 
         // by default, returns null, meaning that Umbraco should auto-detect the application root path.
diff --git a/src/Umbraco.Core/Scoping/Scope.cs b/src/Umbraco.Core/Scoping/Scope.cs
index 84273e23da..3eabfbca9b 100644
--- a/src/Umbraco.Core/Scoping/Scope.cs
+++ b/src/Umbraco.Core/Scoping/Scope.cs
@@ -17,6 +17,7 @@ namespace Umbraco.Core.Scoping
     {
         private readonly ScopeProvider _scopeProvider;
         private readonly ILogger _logger;
+        private readonly ITypeFinder _typeFinder;
 
         private readonly IsolationLevel _isolationLevel;
         private readonly RepositoryCacheMode _repositoryCacheMode;
@@ -35,7 +36,7 @@ namespace Umbraco.Core.Scoping
 
         // initializes a new scope
         private Scope(ScopeProvider scopeProvider,
-            ILogger logger, FileSystems fileSystems, Scope parent, ScopeContext scopeContext, bool detachable,
+            ILogger logger, ITypeFinder typeFinder, FileSystems fileSystems, Scope parent, ScopeContext scopeContext, bool detachable,
             IsolationLevel isolationLevel = IsolationLevel.Unspecified,
             RepositoryCacheMode repositoryCacheMode = RepositoryCacheMode.Unspecified,
             IEventDispatcher eventDispatcher = null,
@@ -45,6 +46,7 @@ namespace Umbraco.Core.Scoping
         {
             _scopeProvider = scopeProvider;
             _logger = logger;
+            _typeFinder = typeFinder;
 
             Context = scopeContext;
 
@@ -109,26 +111,26 @@ namespace Umbraco.Core.Scoping
 
         // initializes a new scope
         public Scope(ScopeProvider scopeProvider,
-            ILogger logger, FileSystems fileSystems, bool detachable, ScopeContext scopeContext,
+            ILogger logger, ITypeFinder typeFinder, FileSystems fileSystems, bool detachable, ScopeContext scopeContext,
             IsolationLevel isolationLevel = IsolationLevel.Unspecified,
             RepositoryCacheMode repositoryCacheMode = RepositoryCacheMode.Unspecified,
             IEventDispatcher eventDispatcher = null,
             bool? scopeFileSystems = null,
             bool callContext = false,
             bool autoComplete = false)
-            : this(scopeProvider, logger, fileSystems, null, scopeContext, detachable, isolationLevel, repositoryCacheMode, eventDispatcher, scopeFileSystems, callContext, autoComplete)
+            : this(scopeProvider, logger, typeFinder, fileSystems, null, scopeContext, detachable, isolationLevel, repositoryCacheMode, eventDispatcher, scopeFileSystems, callContext, autoComplete)
         { }
 
         // initializes a new scope in a nested scopes chain, with its parent
         public Scope(ScopeProvider scopeProvider,
-            ILogger logger, FileSystems fileSystems, Scope parent,
+            ILogger logger, ITypeFinder typeFinder, FileSystems fileSystems, Scope parent,
             IsolationLevel isolationLevel = IsolationLevel.Unspecified,
             RepositoryCacheMode repositoryCacheMode = RepositoryCacheMode.Unspecified,
             IEventDispatcher eventDispatcher = null,
             bool? scopeFileSystems = null,
             bool callContext = false,
             bool autoComplete = false)
-            : this(scopeProvider, logger, fileSystems, parent, null, false, isolationLevel, repositoryCacheMode, eventDispatcher, scopeFileSystems, callContext, autoComplete)
+            : this(scopeProvider, logger, typeFinder, fileSystems, parent, null, false, isolationLevel, repositoryCacheMode, eventDispatcher, scopeFileSystems, callContext, autoComplete)
         { }
 
         public Guid InstanceId { get; } = Guid.NewGuid();
@@ -175,7 +177,7 @@ namespace Umbraco.Core.Scoping
                 if (ParentScope != null) return ParentScope.IsolatedCaches;
 
                 return _isolatedCaches ?? (_isolatedCaches
-                           = new IsolatedCaches(type => new DeepCloneAppCache(new ObjectCacheAppCache())));
+                           = new IsolatedCaches(type => new DeepCloneAppCache(new ObjectCacheAppCache(_typeFinder))));
             }
         }
 
diff --git a/src/Umbraco.Core/Scoping/ScopeProvider.cs b/src/Umbraco.Core/Scoping/ScopeProvider.cs
index 3c0fa94327..60cb83fcd5 100644
--- a/src/Umbraco.Core/Scoping/ScopeProvider.cs
+++ b/src/Umbraco.Core/Scoping/ScopeProvider.cs
@@ -22,13 +22,15 @@ namespace Umbraco.Core.Scoping
     internal class ScopeProvider : IScopeProvider, IScopeAccessor
     {
         private readonly ILogger _logger;
+        private readonly ITypeFinder _typeFinder;
         private readonly FileSystems _fileSystems;
 
-        public ScopeProvider(IUmbracoDatabaseFactory databaseFactory, FileSystems fileSystems, ILogger logger)
+        public ScopeProvider(IUmbracoDatabaseFactory databaseFactory, FileSystems fileSystems, ILogger logger, ITypeFinder typeFinder)
         {
             DatabaseFactory = databaseFactory;
             _fileSystems = fileSystems;
             _logger = logger;
+            _typeFinder = typeFinder;
 
             // take control of the FileSystems
             _fileSystems.IsScoped = () => AmbientScope != null && AmbientScope.ScopedFileSystems;
@@ -323,7 +325,7 @@ namespace Umbraco.Core.Scoping
             IEventDispatcher eventDispatcher = null,
             bool? scopeFileSystems = null)
         {
-            return new Scope(this, _logger, _fileSystems, true, null, isolationLevel, repositoryCacheMode, eventDispatcher, scopeFileSystems);
+            return new Scope(this, _logger, _typeFinder, _fileSystems, true, null, isolationLevel, repositoryCacheMode, eventDispatcher, scopeFileSystems);
         }
 
         /// <inheritdoc />
@@ -379,13 +381,13 @@ namespace Umbraco.Core.Scoping
             {
                 var ambientContext = AmbientContext;
                 var newContext = ambientContext == null ? new ScopeContext() : null;
-                var scope = new Scope(this, _logger, _fileSystems, false, newContext, isolationLevel, repositoryCacheMode, eventDispatcher, scopeFileSystems, callContext, autoComplete);
+                var scope = new Scope(this, _logger, _typeFinder, _fileSystems, false, newContext, isolationLevel, repositoryCacheMode, eventDispatcher, scopeFileSystems, callContext, autoComplete);
                 // assign only if scope creation did not throw!
                 SetAmbient(scope, newContext ?? ambientContext);
                 return scope;
             }
 
-            var nested = new Scope(this, _logger, _fileSystems, ambientScope, isolationLevel, repositoryCacheMode, eventDispatcher, scopeFileSystems, callContext, autoComplete);
+            var nested = new Scope(this, _logger, _typeFinder, _fileSystems, ambientScope, isolationLevel, repositoryCacheMode, eventDispatcher, scopeFileSystems, callContext, autoComplete);
             SetAmbient(nested, AmbientContext);
             return nested;
         }
diff --git a/src/Umbraco.Core/Security/BackOfficeUserStore.cs b/src/Umbraco.Core/Security/BackOfficeUserStore.cs
index 085a7b7a5b..d48bcc841f 100644
--- a/src/Umbraco.Core/Security/BackOfficeUserStore.cs
+++ b/src/Umbraco.Core/Security/BackOfficeUserStore.cs
@@ -141,7 +141,7 @@ namespace Umbraco.Core.Security
                 if (isLoginsPropertyDirty)
                 {
                     var logins = await GetLoginsAsync(user);
-                    _externalLoginService.SaveUserLogins(found.Id, logins);
+                    _externalLoginService.SaveUserLogins(found.Id, logins.Select(UserLoginInfoWrapper.Wrap));
                 }
             }
         }
@@ -382,7 +382,7 @@ namespace Umbraco.Core.Security
             if (login == null) throw new ArgumentNullException("login");
 
             //get all logins associated with the login id
-            var result = _externalLoginService.Find(login).ToArray();
+            var result = _externalLoginService.Find(UserLoginInfoWrapper.Wrap(login)).ToArray();
             if (result.Any())
             {
                 //return the first user that matches the result
diff --git a/src/Umbraco.Core/Services/Changes/ContentTypeChangeExtensions.cs b/src/Umbraco.Core/Services/Changes/ContentTypeChangeExtensions.cs
index f783098db0..d9ac97ebcd 100644
--- a/src/Umbraco.Core/Services/Changes/ContentTypeChangeExtensions.cs
+++ b/src/Umbraco.Core/Services/Changes/ContentTypeChangeExtensions.cs
@@ -3,7 +3,7 @@ using Umbraco.Core.Models;
 
 namespace Umbraco.Core.Services.Changes
 {
-    internal static class ContentTypeChangeExtensions
+    public static class ContentTypeChangeExtensions
     {
         public static ContentTypeChange<TItem>.EventArgs ToEventArgs<TItem>(this IEnumerable<ContentTypeChange<TItem>> changes)
             where TItem : class, IContentTypeComposition
diff --git a/src/Umbraco.Core/Services/IMembershipMemberService.cs b/src/Umbraco.Core/Services/IMembershipMemberService.cs
index 448b0c761a..4ecbaa5338 100644
--- a/src/Umbraco.Core/Services/IMembershipMemberService.cs
+++ b/src/Umbraco.Core/Services/IMembershipMemberService.cs
@@ -23,148 +23,5 @@ namespace Umbraco.Core.Services
         IMember CreateMemberWithIdentity(string username, string email, IMemberType memberType);
     }
 
-    /// <summary>
-    /// Defines part of the UserService/MemberService, which is specific to methods used by the membership provider.
-    /// The generic type is restricted to <see cref="IMembershipUser"/>. The implementation of this interface  uses
-    /// either <see cref="IMember"/> for the MemberService or <see cref="IUser"/> for the UserService.
-    /// </summary>
-    /// <remarks>
-    /// Idea is to have this as an isolated interface so that it can be easily 'replaced' in the membership provider implementation.
-    /// </remarks>
-    public interface IMembershipMemberService<T> : IService
-        where T : class, IMembershipUser
-    {
-        /// <summary>
-        /// Gets the total number of Members or Users based on the count type
-        /// </summary>
-        /// <remarks>
-        /// The way the Online count is done is the same way that it is done in the MS SqlMembershipProvider - We query for any members
-        /// that have their last active date within the Membership.UserIsOnlineTimeWindow (which is in minutes). It isn't exact science
-        /// but that is how MS have made theirs so we'll follow that principal.
-        /// </remarks>
-        /// <param name="countType"><see cref="MemberCountType"/> to count by</param>
-        /// <returns><see cref="System.int"/> with number of Members or Users for passed in type</returns>
-        int GetCount(MemberCountType countType);
-
-        /// <summary>
-        /// Checks if a Member with the username exists
-        /// </summary>
-        /// <param name="username">Username to check</param>
-        /// <returns><c>True</c> if the Member exists otherwise <c>False</c></returns>
-        bool Exists(string username);
-
-        /// <summary>
-        /// Creates and persists a new <see cref="IMembershipUser"/>
-        /// </summary>
-        /// <remarks>An <see cref="IMembershipUser"/> can be of type <see cref="IMember"/> or <see cref="IUser"/></remarks>
-        /// <param name="username">Username of the <see cref="IMembershipUser"/> to create</param>
-        /// <param name="email">Email of the <see cref="IMembershipUser"/> to create</param>
-        /// <param name="passwordValue">This value should be the encoded/encrypted/hashed value for the password that will be stored in the database</param>
-        /// <param name="memberTypeAlias">Alias of the Type</param>
-        /// <returns><see cref="IMembershipUser"/></returns>
-        T CreateWithIdentity(string username, string email, string passwordValue, string memberTypeAlias);
-
-        /// <summary>
-        /// Creates and persists a new <see cref="IMembershipUser"/>
-        /// </summary>
-        /// <remarks>An <see cref="IMembershipUser"/> can be of type <see cref="IMember"/> or <see cref="IUser"/></remarks>
-        /// <param name="username">Username of the <see cref="IMembershipUser"/> to create</param>
-        /// <param name="email">Email of the <see cref="IMembershipUser"/> to create</param>
-        /// <param name="passwordValue">This value should be the encoded/encrypted/hashed value for the password that will be stored in the database</param>
-        /// <param name="memberTypeAlias">Alias of the Type</param>
-        /// <param name="isApproved">IsApproved of the <see cref="IMembershipUser"/> to create</param>
-        /// <returns><see cref="IMembershipUser"/></returns>
-        T CreateWithIdentity(string username, string email, string passwordValue, string memberTypeAlias, bool isApproved);
-
-        /// <summary>
-        /// Gets an <see cref="IMembershipUser"/> by its provider key
-        /// </summary>
-        /// <remarks>An <see cref="IMembershipUser"/> can be of type <see cref="IMember"/> or <see cref="IUser"/></remarks>
-        /// <param name="id">Id to use for retrieval</param>
-        /// <returns><see cref="IMembershipUser"/></returns>
-        T GetByProviderKey(object id);
-
-        /// <summary>
-        /// Get an <see cref="IMembershipUser"/> by email
-        /// </summary>
-        /// <remarks>An <see cref="IMembershipUser"/> can be of type <see cref="IMember"/> or <see cref="IUser"/></remarks>
-        /// <param name="email">Email to use for retrieval</param>
-        /// <returns><see cref="IMembershipUser"/></returns>
-        T GetByEmail(string email);
-
-        /// <summary>
-        /// Get an <see cref="IMembershipUser"/> by username
-        /// </summary>
-        /// <remarks>An <see cref="IMembershipUser"/> can be of type <see cref="IMember"/> or <see cref="IUser"/></remarks>
-        /// <param name="username">Username to use for retrieval</param>
-        /// <returns><see cref="IMembershipUser"/></returns>
-        T GetByUsername(string username);
-
-        /// <summary>
-        /// Deletes an <see cref="IMembershipUser"/>
-        /// </summary>
-        /// <remarks>An <see cref="IMembershipUser"/> can be of type <see cref="IMember"/> or <see cref="IUser"/></remarks>
-        /// <param name="membershipUser"><see cref="IMember"/> or <see cref="IUser"/> to Delete</param>
-        void Delete(T membershipUser);
-
-        /// <summary>
-        /// Saves an <see cref="IMembershipUser"/>
-        /// </summary>
-        /// <remarks>An <see cref="IMembershipUser"/> can be of type <see cref="IMember"/> or <see cref="IUser"/></remarks>
-        /// <param name="entity"><see cref="IMember"/> or <see cref="IUser"/> to Save</param>
-        /// <param name="raiseEvents">Optional parameter to raise events.
-        /// Default is <c>True</c> otherwise set to <c>False</c> to not raise events</param>
-        void Save(T entity, bool raiseEvents = true);
-
-        /// <summary>
-        /// Saves a list of <see cref="IMembershipUser"/> objects
-        /// </summary>
-        /// <remarks>An <see cref="IMembershipUser"/> can be of type <see cref="IMember"/> or <see cref="IUser"/></remarks>
-        /// <param name="entities"><see cref="IEnumerable{T}"/> to save</param>
-        /// <param name="raiseEvents">Optional parameter to raise events.
-        /// Default is <c>True</c> otherwise set to <c>False</c> to not raise events</param>
-        void Save(IEnumerable<T> entities, bool raiseEvents = true);
-
-        /// <summary>
-        /// Gets the default MemberType alias
-        /// </summary>
-        /// <remarks>By default we'll return the 'writer', but we need to check it exists. If it doesn't we'll
-        /// return the first type that is not an admin, otherwise if there's only one we will return that one.</remarks>
-        /// <returns>Alias of the default MemberType</returns>
-        string GetDefaultMemberType();
-
-        /// <summary>
-        /// Finds a list of <see cref="IMembershipUser"/> objects by a partial email string
-        /// </summary>
-        /// <remarks>An <see cref="IMembershipUser"/> can be of type <see cref="IMember"/> or <see cref="IUser"/></remarks>
-        /// <param name="emailStringToMatch">Partial email string to match</param>
-        /// <param name="pageIndex">Current page index</param>
-        /// <param name="pageSize">Size of the page</param>
-        /// <param name="totalRecords">Total number of records found (out)</param>
-        /// <param name="matchType">The type of match to make as <see cref="StringPropertyMatchType"/>. Default is <see cref="StringPropertyMatchType.StartsWith"/></param>
-        /// <returns><see cref="IEnumerable{T}"/></returns>
-        IEnumerable<T> FindByEmail(string emailStringToMatch, long pageIndex, int pageSize, out long totalRecords, StringPropertyMatchType matchType = StringPropertyMatchType.StartsWith);
-
-        /// <summary>
-        /// Finds a list of <see cref="IMembershipUser"/> objects by a partial username
-        /// </summary>
-        /// <remarks>An <see cref="IMembershipUser"/> can be of type <see cref="IMember"/> or <see cref="IUser"/></remarks>
-        /// <param name="login">Partial username to match</param>
-        /// <param name="pageIndex">Current page index</param>
-        /// <param name="pageSize">Size of the page</param>
-        /// <param name="totalRecords">Total number of records found (out)</param>
-        /// <param name="matchType">The type of match to make as <see cref="StringPropertyMatchType"/>. Default is <see cref="StringPropertyMatchType.StartsWith"/></param>
-        /// <returns><see cref="IEnumerable{T}"/></returns>
-        IEnumerable<T> FindByUsername(string login, long pageIndex, int pageSize, out long totalRecords, StringPropertyMatchType matchType = StringPropertyMatchType.StartsWith);
-
-        /// <summary>
-        /// Gets a list of paged <see cref="IMembershipUser"/> objects
-        /// </summary>
-        /// <remarks>An <see cref="IMembershipUser"/> can be of type <see cref="IMember"/> or <see cref="IUser"/></remarks>
-        /// <param name="pageIndex">Current page index</param>
-        /// <param name="pageSize">Size of the page</param>
-        /// <param name="totalRecords">Total number of records found (out)</param>
-        /// <returns><see cref="IEnumerable{T}"/></returns>
-        IEnumerable<T> GetAll(long pageIndex, int pageSize, out long totalRecords);
-    }
+    
 }
diff --git a/src/Umbraco.Core/Services/INotificationService.cs b/src/Umbraco.Core/Services/INotificationService.cs
index a990b1e0ff..1a48d73297 100644
--- a/src/Umbraco.Core/Services/INotificationService.cs
+++ b/src/Umbraco.Core/Services/INotificationService.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Core.Services
         /// <param name="operatingUser"></param>
         /// <param name="action"></param>
         /// <param name="actionName"></param>
-        /// <param name="http"></param>
+        /// <param name="siteUri"></param>
         /// <param name="createSubject"></param>
         /// <param name="createBody"></param>
         void SendNotifications(IUser operatingUser, IEnumerable<IContent> entities, string action, string actionName, Uri siteUri,
diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs
index 5a43738230..2fa75e2f3f 100644
--- a/src/Umbraco.Core/Services/Implement/ContentService.cs
+++ b/src/Umbraco.Core/Services/Implement/ContentService.cs
@@ -1402,7 +1402,7 @@ namespace Umbraco.Core.Services.Implement
                             if (d.Trashed) continue; // won't publish
 
                             //publish the culture values and validate the property values, if validation fails, log the invalid properties so the develeper has an idea of what has failed
-                            Property[] invalidProperties = null;
+                            IProperty[] invalidProperties = null;
                             var impact = CultureImpact.Explicit(culture, IsDefaultCulture(allLangs, culture));
                             var tryPublish = d.PublishCulture(impact) && _propertyValidationService.Value.IsPropertyDataValid(d, out invalidProperties, impact);
                             if (invalidProperties != null && invalidProperties.Length > 0)
@@ -2602,7 +2602,7 @@ namespace Umbraco.Core.Services.Implement
                 return new PublishResult(PublishResultType.FailedPublishContentInvalid, evtMsgs, content);
 
             //validate the property values
-            Property[] invalidProperties = null;
+            IProperty[] invalidProperties = null;
             if (!impactsToPublish.All(x => _propertyValidationService.Value.IsPropertyDataValid(content, out invalidProperties, x)))
                 return new PublishResult(PublishResultType.FailedPublishContentInvalid, evtMsgs, content)
                 {
diff --git a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
index bc21da15a7..f488c12657 100644
--- a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
+++ b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
@@ -77,7 +77,7 @@ namespace Umbraco.Core.Services.Implement
                     var children = _contentService.GetPagedChildren(content.Id, page++, pageSize, out total);
                     SerializeChildren(children, xml, published);
                 }
-                
+
             }
 
             return xml;
@@ -552,7 +552,7 @@ namespace Umbraco.Core.Services.Implement
         }
 
         // exports a property as XElements.
-        private IEnumerable<XElement> SerializeProperty(Property property, bool published)
+        private IEnumerable<XElement> SerializeProperty(IProperty property, bool published)
         {
             var propertyType = property.PropertyType;
 
@@ -560,7 +560,7 @@ namespace Umbraco.Core.Services.Implement
             var propertyEditor = Current.PropertyEditors[propertyType.PropertyEditorAlias];
             return propertyEditor == null
                 ? Array.Empty<XElement>()
-                : propertyEditor.GetValueEditor().ConvertDbToXml(property, _dataTypeService, _localizationService, published);
+                : propertyEditor.GetValueEditor().ConvertDbToXml(property, published);
         }
 
         // exports an IContent item descendants.
diff --git a/src/Umbraco.Core/Services/Implement/ExternalLoginService.cs b/src/Umbraco.Core/Services/Implement/ExternalLoginService.cs
index aedf3874dd..0d6a345e90 100644
--- a/src/Umbraco.Core/Services/Implement/ExternalLoginService.cs
+++ b/src/Umbraco.Core/Services/Implement/ExternalLoginService.cs
@@ -40,7 +40,7 @@ namespace Umbraco.Core.Services.Implement
         /// </summary>
         /// <param name="login"></param>
         /// <returns></returns>
-        public IEnumerable<IIdentityUserLogin> Find(UserLoginInfo login)
+        public IEnumerable<IIdentityUserLogin> Find(IUserLoginInfo login)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
             {
@@ -54,7 +54,7 @@ namespace Umbraco.Core.Services.Implement
         /// </summary>
         /// <param name="userId"></param>
         /// <param name="logins"></param>
-        public void SaveUserLogins(int userId, IEnumerable<UserLoginInfo> logins)
+        public void SaveUserLogins(int userId, IEnumerable<IUserLoginInfo> logins)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
diff --git a/src/Umbraco.Core/Services/Implement/FileService.cs b/src/Umbraco.Core/Services/Implement/FileService.cs
index 2cdff9a8e4..cde8ed30fe 100644
--- a/src/Umbraco.Core/Services/Implement/FileService.cs
+++ b/src/Umbraco.Core/Services/Implement/FileService.cs
@@ -45,11 +45,8 @@ namespace Umbraco.Core.Services.Implement
 
         #region Stylesheets
 
-        /// <summary>
-        /// Gets a list of all <see cref="Stylesheet"/> objects
-        /// </summary>
-        /// <returns>An enumerable list of <see cref="Stylesheet"/> objects</returns>
-        public IEnumerable<Stylesheet> GetStylesheets(params string[] names)
+        /// <inheritdoc />
+        public IEnumerable<IStylesheet> GetStylesheets(params string[] names)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
             {
@@ -57,12 +54,8 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Gets a <see cref="Stylesheet"/> object by its name
-        /// </summary>
-        /// <param name="name">Name of the stylesheet incl. extension</param>
-        /// <returns>A <see cref="Stylesheet"/> object</returns>
-        public Stylesheet GetStylesheetByName(string name)
+        /// <inheritdoc />
+        public IStylesheet GetStylesheetByName(string name)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
             {
@@ -70,16 +63,12 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Saves a <see cref="Stylesheet"/>
-        /// </summary>
-        /// <param name="stylesheet"><see cref="Stylesheet"/> to save</param>
-        /// <param name="userId"></param>
-        public void SaveStylesheet(Stylesheet stylesheet, int userId = Constants.Security.SuperUserId)
+        /// <inheritdoc />
+        public void SaveStylesheet(IStylesheet stylesheet, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
-                var saveEventArgs = new SaveEventArgs<Stylesheet>(stylesheet);
+                var saveEventArgs = new SaveEventArgs<IStylesheet>(stylesheet);
                 if (scope.Events.DispatchCancelable(SavingStylesheet, this, saveEventArgs))
                 {
                     scope.Complete();
@@ -91,16 +80,12 @@ namespace Umbraco.Core.Services.Implement
                 saveEventArgs.CanCancel = false;
                 scope.Events.Dispatch(SavedStylesheet, this, saveEventArgs);
 
-                Audit(AuditType.Save, userId, -1, ObjectTypes.GetName(UmbracoObjectTypes.Stylesheet));
+                Audit(AuditType.Save, userId, -1, UmbracoObjectTypes.Stylesheet.GetName());
                 scope.Complete();
             }
         }
 
-        /// <summary>
-        /// Deletes a stylesheet by its name
-        /// </summary>
-        /// <param name="path">Name incl. extension of the Stylesheet to delete</param>
-        /// <param name="userId"></param>
+        /// <inheritdoc />
         public void DeleteStylesheet(string path, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
@@ -112,7 +97,7 @@ namespace Umbraco.Core.Services.Implement
                     return;
                 }
 
-                var deleteEventArgs = new DeleteEventArgs<Stylesheet>(stylesheet);
+                var deleteEventArgs = new DeleteEventArgs<IStylesheet>(stylesheet);
                 if (scope.Events.DispatchCancelable(DeletingStylesheet, this, deleteEventArgs))
                 {
                     scope.Complete();
@@ -123,17 +108,13 @@ namespace Umbraco.Core.Services.Implement
                 deleteEventArgs.CanCancel = false;
                 scope.Events.Dispatch(DeletedStylesheet, this, deleteEventArgs);
 
-                Audit(AuditType.Delete, userId, -1, ObjectTypes.GetName(UmbracoObjectTypes.Stylesheet));
+                Audit(AuditType.Delete, userId, -1, UmbracoObjectTypes.Stylesheet.GetName());
                 scope.Complete();
             }
         }
 
-        /// <summary>
-        /// Validates a <see cref="Stylesheet"/>
-        /// </summary>
-        /// <param name="stylesheet"><see cref="Stylesheet"/> to validate</param>
-        /// <returns>True if Stylesheet is valid, otherwise false</returns>
-        public bool ValidateStylesheet(Stylesheet stylesheet)
+        /// <inheritdoc />
+        public bool ValidateStylesheet(IStylesheet stylesheet)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
             {
@@ -145,7 +126,7 @@ namespace Umbraco.Core.Services.Implement
         {
             using (var scope = ScopeProvider.CreateScope())
             {
-                ((StylesheetRepository) _stylesheetRepository).AddFolder(folderPath);
+                _stylesheetRepository.AddFolder(folderPath);
                 scope.Complete();
             }
         }
@@ -154,7 +135,7 @@ namespace Umbraco.Core.Services.Implement
         {
             using (var scope = ScopeProvider.CreateScope())
             {
-                ((StylesheetRepository) _stylesheetRepository).DeleteFolder(folderPath);
+                _stylesheetRepository.DeleteFolder(folderPath);
                 scope.Complete();
             }
         }
@@ -188,11 +169,8 @@ namespace Umbraco.Core.Services.Implement
 
         #region Scripts
 
-        /// <summary>
-        /// Gets a list of all <see cref="Script"/> objects
-        /// </summary>
-        /// <returns>An enumerable list of <see cref="Script"/> objects</returns>
-        public IEnumerable<Script> GetScripts(params string[] names)
+        /// <inheritdoc />
+        public IEnumerable<IScript> GetScripts(params string[] names)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
             {
@@ -200,12 +178,8 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Gets a <see cref="Script"/> object by its name
-        /// </summary>
-        /// <param name="name">Name of the script incl. extension</param>
-        /// <returns>A <see cref="Script"/> object</returns>
-        public Script GetScriptByName(string name)
+        /// <inheritdoc />
+        public IScript GetScriptByName(string name)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
             {
@@ -213,16 +187,12 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Saves a <see cref="Script"/>
-        /// </summary>
-        /// <param name="script"><see cref="Script"/> to save</param>
-        /// <param name="userId"></param>
-        public void SaveScript(Script script, int userId = Constants.Security.SuperUserId)
+        /// <inheritdoc />
+        public void SaveScript(IScript script, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
             {
-                var saveEventArgs = new SaveEventArgs<Script>(script);
+                var saveEventArgs = new SaveEventArgs<IScript>(script);
                 if (scope.Events.DispatchCancelable(SavingScript, this, saveEventArgs))
                 {
                     scope.Complete();
@@ -238,11 +208,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Deletes a script by its name
-        /// </summary>
-        /// <param name="path">Name incl. extension of the Script to delete</param>
-        /// <param name="userId"></param>
+        /// <inheritdoc />
         public void DeleteScript(string path, int userId = Constants.Security.SuperUserId)
         {
             using (var scope = ScopeProvider.CreateScope())
@@ -254,7 +220,7 @@ namespace Umbraco.Core.Services.Implement
                     return;
                 }
 
-                var deleteEventArgs = new DeleteEventArgs<Script>(script);
+                var deleteEventArgs = new DeleteEventArgs<IScript>(script);
                 if (scope.Events.DispatchCancelable(DeletingScript, this, deleteEventArgs))
                 {
                     scope.Complete();
@@ -270,12 +236,8 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Validates a <see cref="Script"/>
-        /// </summary>
-        /// <param name="script"><see cref="Script"/> to validate</param>
-        /// <returns>True if Script is valid, otherwise false</returns>
-        public bool ValidateScript(Script script)
+        /// <inheritdoc />
+        public bool ValidateScript(IScript script)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
             {
@@ -287,7 +249,7 @@ namespace Umbraco.Core.Services.Implement
         {
             using (var scope = ScopeProvider.CreateScope())
             {
-                ((ScriptRepository) _scriptRepository).AddFolder(folderPath);
+                _scriptRepository.AddFolder(folderPath);
                 scope.Complete();
             }
         }
@@ -296,7 +258,7 @@ namespace Umbraco.Core.Services.Implement
         {
             using (var scope = ScopeProvider.CreateScope())
             {
-                ((ScriptRepository) _scriptRepository).DeleteFolder(folderPath);
+                _scriptRepository.DeleteFolder(folderPath);
                 scope.Complete();
             }
         }
@@ -578,7 +540,7 @@ namespace Umbraco.Core.Services.Implement
 
                 scope.Events.Dispatch(SavedTemplate, this, new SaveEventArgs<ITemplate>(template, false));
 
-                Audit(AuditType.Save, userId, template.Id, ObjectTypes.GetName(UmbracoObjectTypes.Template));
+                Audit(AuditType.Save, userId, template.Id, UmbracoObjectTypes.Template.GetName());
                 scope.Complete();
             }
         }
@@ -604,7 +566,7 @@ namespace Umbraco.Core.Services.Implement
 
                 scope.Events.Dispatch(SavedTemplate, this, new SaveEventArgs<ITemplate>(templatesA, false));
 
-                Audit(AuditType.Save, userId, -1, ObjectTypes.GetName(UmbracoObjectTypes.Template));
+                Audit(AuditType.Save, userId, -1, UmbracoObjectTypes.Template.GetName());
                 scope.Complete();
             }
         }
@@ -907,7 +869,7 @@ namespace Umbraco.Core.Services.Implement
             return Attempt.Succeed(partialView);
         }
 
-        public bool ValidatePartialView(PartialView partialView)
+        public bool ValidatePartialView(IPartialView partialView)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
             {
@@ -915,7 +877,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        public bool ValidatePartialViewMacro(PartialView partialView)
+        public bool ValidatePartialViewMacro(IPartialView partialView)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
             {
@@ -1106,22 +1068,22 @@ namespace Umbraco.Core.Services.Implement
         /// <summary>
         /// Occurs before Delete
         /// </summary>
-        public static event TypedEventHandler<IFileService, DeleteEventArgs<Script>> DeletingScript;
+        public static event TypedEventHandler<IFileService, DeleteEventArgs<IScript>> DeletingScript;
 
         /// <summary>
         /// Occurs after Delete
         /// </summary>
-        public static event TypedEventHandler<IFileService, DeleteEventArgs<Script>> DeletedScript;
+        public static event TypedEventHandler<IFileService, DeleteEventArgs<IScript>> DeletedScript;
 
         /// <summary>
         /// Occurs before Delete
         /// </summary>
-        public static event TypedEventHandler<IFileService, DeleteEventArgs<Stylesheet>> DeletingStylesheet;
+        public static event TypedEventHandler<IFileService, DeleteEventArgs<IStylesheet>> DeletingStylesheet;
 
         /// <summary>
         /// Occurs after Delete
         /// </summary>
-        public static event TypedEventHandler<IFileService, DeleteEventArgs<Stylesheet>> DeletedStylesheet;
+        public static event TypedEventHandler<IFileService, DeleteEventArgs<IStylesheet>> DeletedStylesheet;
 
         /// <summary>
         /// Occurs before Save
@@ -1136,22 +1098,22 @@ namespace Umbraco.Core.Services.Implement
         /// <summary>
         /// Occurs before Save
         /// </summary>
-        public static event TypedEventHandler<IFileService, SaveEventArgs<Script>> SavingScript;
+        public static event TypedEventHandler<IFileService, SaveEventArgs<IScript>> SavingScript;
 
         /// <summary>
         /// Occurs after Save
         /// </summary>
-        public static event TypedEventHandler<IFileService, SaveEventArgs<Script>> SavedScript;
+        public static event TypedEventHandler<IFileService, SaveEventArgs<IScript>> SavedScript;
 
         /// <summary>
         /// Occurs before Save
         /// </summary>
-        public static event TypedEventHandler<IFileService, SaveEventArgs<Stylesheet>> SavingStylesheet;
+        public static event TypedEventHandler<IFileService, SaveEventArgs<IStylesheet>> SavingStylesheet;
 
         /// <summary>
         /// Occurs after Save
         /// </summary>
-        public static event TypedEventHandler<IFileService, SaveEventArgs<Stylesheet>> SavedStylesheet;
+        public static event TypedEventHandler<IFileService, SaveEventArgs<IStylesheet>> SavedStylesheet;
 
         /// <summary>
         /// Occurs before Save
diff --git a/src/Umbraco.Core/Services/Implement/MediaService.cs b/src/Umbraco.Core/Services/Implement/MediaService.cs
index e9fdedbf33..7928379208 100644
--- a/src/Umbraco.Core/Services/Implement/MediaService.cs
+++ b/src/Umbraco.Core/Services/Implement/MediaService.cs
@@ -1252,7 +1252,7 @@ namespace Umbraco.Core.Services.Implement
         /// <summary>
         /// Occurs after change.
         /// </summary>
-        internal static event TypedEventHandler<IMediaService, TreeChange<IMedia>.EventArgs> TreeChanged;
+        public static event TypedEventHandler<IMediaService, TreeChange<IMedia>.EventArgs> TreeChanged;
 
         #endregion
 
diff --git a/src/Umbraco.Core/Services/Implement/MemberService.cs b/src/Umbraco.Core/Services/Implement/MemberService.cs
index 2180b02bfa..fa45771e6f 100644
--- a/src/Umbraco.Core/Services/Implement/MemberService.cs
+++ b/src/Umbraco.Core/Services/Implement/MemberService.cs
@@ -28,14 +28,13 @@ namespace Umbraco.Core.Services.Implement
         private readonly IAuditRepository _auditRepository;
 
         private readonly IMemberGroupService _memberGroupService;
-        private readonly IMediaFileSystem _mediaFileSystem;
 
         //only for unit tests!
         internal MembershipProviderBase MembershipProvider { get; set; }
 
         #region Constructor
 
-        public MemberService(IScopeProvider provider, ILogger logger, IEventMessagesFactory eventMessagesFactory, IMemberGroupService memberGroupService,  IMediaFileSystem mediaFileSystem,
+        public MemberService(IScopeProvider provider, ILogger logger, IEventMessagesFactory eventMessagesFactory, IMemberGroupService memberGroupService, 
             IMemberRepository memberRepository, IMemberTypeRepository memberTypeRepository, IMemberGroupRepository memberGroupRepository, IAuditRepository auditRepository)
             : base(provider, logger, eventMessagesFactory)
         {
@@ -44,7 +43,6 @@ namespace Umbraco.Core.Services.Implement
             _memberGroupRepository = memberGroupRepository;
             _auditRepository = auditRepository;
             _memberGroupService = memberGroupService ?? throw new ArgumentNullException(nameof(memberGroupService));
-            _mediaFileSystem = mediaFileSystem ?? throw new ArgumentNullException(nameof(mediaFileSystem));
         }
 
         #endregion
diff --git a/src/Umbraco.Core/Services/PropertyValidationService.cs b/src/Umbraco.Core/Services/PropertyValidationService.cs
index a037a83920..1704d52206 100644
--- a/src/Umbraco.Core/Services/PropertyValidationService.cs
+++ b/src/Umbraco.Core/Services/PropertyValidationService.cs
@@ -31,7 +31,7 @@ namespace Umbraco.Core.Services
         /// <summary>
         /// Validates the content item's properties pass validation rules
         /// </summary>
-        public bool IsPropertyDataValid(IContent content, out Property[] invalidProperties, CultureImpact impact)
+        public bool IsPropertyDataValid(IContent content, out IProperty[] invalidProperties, CultureImpact impact)
         {
             // select invalid properties
             invalidProperties = content.Properties.Where(x =>
@@ -66,7 +66,7 @@ namespace Umbraco.Core.Services
         /// <summary>
         /// Gets a value indicating whether the property has valid values.
         /// </summary>
-        public bool IsPropertyValid(Property property, string culture = "*", string segment = "*")
+        public bool IsPropertyValid(IProperty property, string culture = "*", string segment = "*")
         {
             //NOTE - the pvalue and vvalues logic in here is borrowed directly from the Property.Values setter so if you are wondering what that's all about, look there.
             // The underlying Property._pvalue and Property._vvalues are not exposed but we can re-create these values ourselves which is what it's doing.
@@ -74,7 +74,7 @@ namespace Umbraco.Core.Services
             culture = culture.NullOrWhiteSpaceAsNull();
             segment = segment.NullOrWhiteSpaceAsNull();
 
-            Property.PropertyValue pvalue = null;
+            IPropertyValue pvalue = null;
 
             // if validating invariant/neutral, and it is supported, validate
             // (including ensuring that the value exists, if mandatory)
@@ -120,7 +120,7 @@ namespace Umbraco.Core.Services
         /// <param name="property"></param>
         /// <param name="value"></param>
         /// <returns>True is property value is valid, otherwise false</returns>
-        private bool IsValidPropertyValue(Property property, object value)
+        private bool IsValidPropertyValue(IProperty property, object value)
         {
             return IsPropertyValueValid(property.PropertyType, value);
         }
@@ -128,7 +128,7 @@ namespace Umbraco.Core.Services
         /// <summary>
         /// Determines whether a value is valid for this property type.
         /// </summary>
-        private bool IsPropertyValueValid(PropertyType propertyType, object value)
+        private bool IsPropertyValueValid(IPropertyType propertyType, object value)
         {
             var editor = _propertyEditors[propertyType.PropertyEditorAlias];
             if (editor == null)
diff --git a/src/Umbraco.Core/Services/PublishResult.cs b/src/Umbraco.Core/Services/PublishResult.cs
index 4f1ff776a2..fe11d77cf3 100644
--- a/src/Umbraco.Core/Services/PublishResult.cs
+++ b/src/Umbraco.Core/Services/PublishResult.cs
@@ -32,6 +32,6 @@ namespace Umbraco.Core.Services
         /// <summary>
         /// Gets or sets the invalid properties, if the status failed due to validation.
         /// </summary>
-        public IEnumerable<Property> InvalidProperties { get; set; }
+        public IEnumerable<IProperty> InvalidProperties { get; set; }
     }
 }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index b542f3f867..dcf4214ab1 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -36,7 +36,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data.Entity" />
     <Reference Include="System.IO.Compression" />
@@ -65,11 +64,14 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Serilog.Sinks.Async">
-      <Version>1.3.0</Version>
+      <Version>1.4.0</Version>
     </PackageReference>
     <PackageReference Include="Serilog.Sinks.Map">
       <Version>1.0.0</Version>
     </PackageReference>
+    <PackageReference Include="System.ComponentModel.Annotations">
+      <Version>4.6.0</Version>
+    </PackageReference>
     <PackageReference Include="Umbraco.Code">
       <Version>1.0.5</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
@@ -91,19 +93,19 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="NPoco" Version="3.9.4" />
     <PackageReference Include="Serilog">
-      <Version>2.8.0</Version>
+      <Version>2.9.0</Version>
     </PackageReference>
     <PackageReference Include="Serilog.Enrichers.Process">
       <Version>2.0.1</Version>
     </PackageReference>
     <PackageReference Include="Serilog.Enrichers.Thread">
-      <Version>3.0.0</Version>
+      <Version>3.1.0</Version>
     </PackageReference>
     <PackageReference Include="Serilog.Filters.Expressions">
       <Version>2.0.0</Version>
     </PackageReference>
     <PackageReference Include="Serilog.Formatting.Compact">
-      <Version>1.0.0</Version>
+      <Version>1.1.0</Version>
     </PackageReference>
     <PackageReference Include="Serilog.Formatting.Compact.Reader">
       <Version>1.0.3</Version>
@@ -112,7 +114,7 @@
       <Version>2.2.2</Version>
     </PackageReference>
     <PackageReference Include="Serilog.Sinks.File">
-      <Version>4.0.0</Version>
+      <Version>4.1.0</Version>
     </PackageReference>
     <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
   </ItemGroup>
@@ -125,14 +127,8 @@
     </Compile>
     -->
     <Compile Include="Cache\DefaultRepositoryCachePolicy.cs" />
-    <Compile Include="Cache\FastDictionaryAppCacheBase.cs" />
-    <Compile Include="Cache\ObjectCacheAppCache.cs" />
     <Compile Include="Compose\AuditEventsComponent.cs" />
-    <Compile Include="Cache\CacheRefresherCollectionBuilder.cs" />
-    <Compile Include="Cache\FastDictionaryAppCache.cs" />
     <Compile Include="Cache\FullDataSetRepositoryCachePolicy.cs" />
-    <Compile Include="Cache\HttpRequestAppCache.cs" />
-    <Compile Include="Cache\WebCachingAppCache.cs" />
     <Compile Include="Cache\RepositoryCachePolicyBase.cs" />
     <Compile Include="Cache\SingleItemsOnlyRepositoryCachePolicy.cs" />
     <Compile Include="Compose\AuditEventsComposer.cs" />
@@ -176,18 +172,13 @@
     <Compile Include="Composing\LightInject\LightInjectContainer.cs" />
     <Compile Include="Composing\LightInject\MixedLightInjectScopeManagerProvider.cs" />
     <Compile Include="Composing\TargetedServiceFactory.cs" />
-    <Compile Include="Composing\TypeFinder.cs" />
-    <Compile Include="Composing\TypeLoader.cs" />
     <Compile Include="IO\IMediaFileSystem.cs" />
     <Compile Include="IO\IMediaPathScheme.cs" />
     <Compile Include="IO\IOHelper.cs" />
     <Compile Include="IO\MediaPathSchemes\UniqueMediaPathScheme.cs" />
     <Compile Include="Logging\Viewer\LogTimePeriod.cs" />
-    <Compile Include="Manifest\IManifestFilter.cs" />
-    <Compile Include="Manifest\IManifestParser.cs" />
     <Compile Include="Manifest\IPackageManifest.cs" />
-    <Compile Include="Manifest\ManifestFilterCollection.cs" />
-    <Compile Include="Manifest\ManifestFilterCollectionBuilder.cs" />
+    <Compile Include="Manifest\ManifestParser.cs" />
     <Compile Include="Migrations\IMigrationBuilder.cs" />
     <Compile Include="Migrations\Upgrade\Common\DeleteKeysAndIndexes.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\ContentPickerPreValueMigrator.cs" />
@@ -220,16 +211,12 @@
     <Compile Include="Migrations\Upgrade\V_8_0_1\ChangeNuCacheJsonFormat.cs" />
     <Compile Include="Migrations\Upgrade\V_8_1_0\ConvertTinyMceAndGridMediaUrlsToLocalLink.cs" />
     <Compile Include="Models\ContentBaseExtensions.cs" />
-    <Compile Include="Models\IContent.cs" />
-    <Compile Include="Models\IContentBase.cs" />
     <Compile Include="Models\IContentType.cs" />
     <Compile Include="Models\IContentTypeBase.cs" />
     <Compile Include="Models\IContentTypeComposition.cs" />
-    <Compile Include="Models\IDataEditor.cs" />
     <Compile Include="Models\IDataType.cs" />
-    <Compile Include="Models\IDataValueEditor.cs" />
     <Compile Include="Models\Identity\IdentityMapDefinition.cs" />
-    <Compile Include="Models\IMedia.cs" />
+    <Compile Include="Models\Identity\UserLoginInfoWrapper.cs" />
     <Compile Include="Models\IMediaType.cs" />
     <Compile Include="Models\IMember.cs" />
     <Compile Include="Models\IMemberType.cs" />
@@ -266,10 +253,9 @@
     <Compile Include="Models\PublishedContent\IPublishedPropertyType.cs" />
     <Compile Include="Models\Template.cs" />
     <Compile Include="Models\TemplateOnDisk.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="PropertyEditors\ConfigurationField.cs" />
-    <Compile Include="PropertyEditors\ConfigurationFieldAttribute.cs" />
-    <Compile Include="PropertyEditors\ConfigurationFieldsExtensions.cs" />
+    <Compile Include="PropertyEditors\Validators\DelimitedValueValidator.cs" />
+    <Compile Include="PropertyEditors\Validators\RegexValidator.cs" />
+    <Compile Include="PropertyEditors\Validators\RequiredValidator.cs" />
     <Compile Include="PublishedContentExtensions.cs" />
     <Compile Include="Models\PublishedContent\UrlMode.cs" />
     <Compile Include="Persistence\Dtos\PropertyTypeCommonDto.cs" />
@@ -280,8 +266,6 @@
     <Compile Include="PropertyEditors\DataEditorAttribute.cs" />
     <Compile Include="PropertyEditors\DateTimeConfiguration.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\RenameLabelAndRichTextPropertyEditorAliases.cs" />
-    <Compile Include="PropertyEditors\IPropertyIndexValueFactory.cs" />
-    <Compile Include="PropertyEditors\IValueValidator.cs" />
     <Compile Include="PropertyEditors\PropertyValueConverterCollection.cs" />
     <Compile Include="PropertyEditors\PropertyValueConverterCollectionBuilder.cs" />
     <Compile Include="PropertyEditors\VoidEditor.cs" />
@@ -289,13 +273,10 @@
     <Compile Include="Serialization\JsonNetSerializer.cs" />
     <Compile Include="Services\Changes\ContentTypeChange.cs" />
     <Compile Include="Services\Changes\ContentTypeChangeExtensions.cs" />
-    <Compile Include="Services\Changes\TreeChange.cs" />
-    <Compile Include="Services\Changes\TreeChangeExtensions.cs" />
     <Compile Include="Services\IDataTypeService.cs" />
     <Compile Include="Services\IEntityService.cs" />
-    <Compile Include="Services\IFileService.cs" />
-    <Compile Include="Services\ILocalizationService.cs" />
-    <Compile Include="Services\IMacroService.cs" />
+    <Compile Include="Services\IMembershipMemberService.cs" />
+    <Compile Include="Services\INotificationService.cs" />
     <Compile Include="Services\IPackagingService.cs" />
     <Compile Include="Services\LocalizedTextServiceExtensions.cs" />
     <Compile Include="Services\DateTypeServiceExtensions.cs" />
@@ -335,10 +316,7 @@
     <Compile Include="Logging\Viewer\MessageTemplateFilter.cs" />
     <Compile Include="Logging\Viewer\SavedLogSearch.cs" />
     <Compile Include="Manifest\DashboardAccessRuleConverter.cs" />
-    <Compile Include="Manifest\ManifestSection.cs" />
-    <Compile Include="Manifest\ManifestContentAppDefinition.cs" />
     <Compile Include="Manifest\ManifestContentAppFactory.cs" />
-    <Compile Include="Manifest\ManifestDashboard.cs" />
     <Compile Include="Migrations\MergeBuilder.cs" />
     <Compile Include="Migrations\MigrationBase_Extra.cs" />
     <Compile Include="Migrations\PostMigrations\IPublishedSnapshotRebuilder.cs" />
@@ -374,9 +352,6 @@
     <Compile Include="Migrations\Upgrade\V_8_0_0\UserForeignKeys.cs" />
     <Compile Include="Migrations\Upgrade\Common\CreateKeysAndIndexes.cs" />
     <Compile Include="Models\ContentRepositoryExtensions.cs" />
-    <Compile Include="Models\ContentSchedule.cs" />
-    <Compile Include="Models\ContentScheduleAction.cs" />
-    <Compile Include="Models\ContentScheduleCollection.cs" />
     <Compile Include="Models\ContentTagsExtensions.cs" />
     <Compile Include="Models\ContentTypeBaseExtensions.cs" />
     <Compile Include="Models\DataTypeExtensions.cs" />
@@ -415,8 +390,6 @@
     <Compile Include="Persistence\Mappers\AuditItemMapper.cs" />
     <Compile Include="Persistence\Mappers\ConsentMapper.cs" />
     <Compile Include="Persistence\Mappers\SimpleContentTypeMapper.cs" />
-    <Compile Include="Persistence\Repositories\IAuditEntryRepository.cs" />
-    <Compile Include="Persistence\Repositories\IConsentRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\AuditEntryRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\ConsentRepository.cs" />
     <Compile Include="Persistence\SqlContextExtensions.cs" />
@@ -427,11 +400,7 @@
     <Compile Include="PropertyEditors\ConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\DefaultPropertyIndexValueFactory.cs" />
     <Compile Include="PropertyEditors\DropDownFlexibleConfiguration.cs" />
-    <Compile Include="PropertyEditors\IConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\ImageCropperConfiguration.cs" />
-    <Compile Include="PropertyEditors\IManifestValueValidator.cs" />
-    <Compile Include="PropertyEditors\IValueFormatValidator.cs" />
-    <Compile Include="PropertyEditors\IValueRequiredValidator.cs" />
     <Compile Include="PropertyEditors\LabelConfiguration.cs" />
     <Compile Include="PropertyEditors\LabelConfigurationEditor.cs" />
     <Compile Include="PropertyEditors\LabelPropertyEditor.cs" />
@@ -499,10 +468,8 @@
     <Compile Include="Logging\OwinLogger.cs" />
     <Compile Include="Logging\OwinLoggerFactory.cs" />
     <Compile Include="MainDom.cs" />
-    <Compile Include="Manifest\ManifestParser.cs" />
     <Compile Include="Manifest\ValueValidatorConverter.cs" />
     <Compile Include="Manifest\ManifestWatcher.cs" />
-    <Compile Include="Manifest\PackageManifest.cs" />
     <Compile Include="Manifest\DataEditorConverter.cs" />
     <Compile Include="Migrations\MigrationBuilder.cs" />
     <Compile Include="Migrations\MigrationPlan.cs" />
@@ -521,7 +488,6 @@
     <Compile Include="Models\DictionaryItem.cs" />
     <Compile Include="Models\DictionaryItemExtensions.cs" />
     <Compile Include="Models\DictionaryTranslation.cs" />
-    <Compile Include="Models\EntityContainer.cs" />
     <Compile Include="Models\EntityExtensions.cs" />
     <Compile Include="Models\GridValue.cs" />
     <Compile Include="Models\Identity\BackOfficeIdentityUser.cs" />
@@ -669,7 +635,6 @@
     <Compile Include="Persistence\FaultHandling\Strategies\NetworkConnectivityErrorDetectionStrategy.cs" />
     <Compile Include="Persistence\FaultHandling\Strategies\SqlAzureTransientErrorDetectionStrategy.cs" />
     <Compile Include="Persistence\FaultHandling\ThrottlingCondition.cs" />
-    <Compile Include="Persistence\IReadWriteQueryRepository.cs" />
     <Compile Include="Persistence\ISqlContext.cs" />
     <Compile Include="Persistence\IUmbracoDatabase.cs" />
     <Compile Include="Persistence\IUmbracoDatabaseFactory.cs" />
@@ -823,14 +788,12 @@
     <Compile Include="Persistence\PocoDataDataReader.cs" />
     <Compile Include="Persistence\Querying\CachedExpression.cs" />
     <Compile Include="Persistence\Querying\ExpressionVisitorBase.cs" />
-    <Compile Include="Persistence\Querying\IQuery.cs" />
     <Compile Include="Persistence\Querying\ModelToSqlExpressionVisitor.cs" />
     <Compile Include="Persistence\Querying\PocoToSqlExpressionVisitor.cs" />
     <Compile Include="Persistence\Querying\Query.cs" />
     <Compile Include="Persistence\Querying\QueryExtensions.cs" />
     <Compile Include="Persistence\Querying\SqlExpressionExtensions.cs" />
     <Compile Include="Persistence\Querying\SqlTranslator.cs" />
-    <Compile Include="Persistence\Querying\StringPropertyMatchType.cs" />
     <Compile Include="Persistence\Querying\TextColumnType.cs" />
     <Compile Include="Persistence\Querying\ValuePropertyMatchType.cs" />
     <Compile Include="Persistence\RecordPersistenceType.cs" />
@@ -848,46 +811,18 @@
     <Compile Include="Persistence\Repositories\Implement\EntityRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\ExternalLoginRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\FileRepository.cs" />
-    <Compile Include="Persistence\Repositories\IAuditRepository.cs" />
     <Compile Include="Persistence\Repositories\IDocumentBlueprintRepository.cs" />
     <Compile Include="Persistence\Repositories\IDocumentRepository.cs" />
     <Compile Include="Persistence\Repositories\IContentTypeRepository.cs" />
     <Compile Include="Persistence\Repositories\IContentTypeRepositoryBase.cs" />
-    <Compile Include="Persistence\Repositories\IDataTypeContainerRepository.cs" />
     <Compile Include="Persistence\Repositories\IDataTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\IDictionaryRepository.cs" />
-    <Compile Include="Persistence\Repositories\IDocumentTypeContainerRepository.cs" />
-    <Compile Include="Persistence\Repositories\IDomainRepository.cs" />
-    <Compile Include="Persistence\Repositories\IEntityContainerRepository.cs" />
     <Compile Include="Persistence\Repositories\IEntityRepository.cs" />
-    <Compile Include="Persistence\Repositories\IExternalLoginRepository.cs" />
-    <Compile Include="Persistence\Repositories\ILanguageRepository.cs" />
-    <Compile Include="Persistence\Repositories\IMacroRepository.cs" />
     <Compile Include="Persistence\Repositories\IMediaRepository.cs" />
-    <Compile Include="Persistence\Repositories\IMediaTypeContainerRepository.cs" />
     <Compile Include="Persistence\Repositories\IMediaTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\IMemberGroupRepository.cs" />
     <Compile Include="Persistence\Repositories\IMemberRepository.cs" />
     <Compile Include="Persistence\Repositories\IMemberTypeRepository.cs" />
-    <Compile Include="Persistence\Repositories\INotificationsRepository.cs" />
-    <Compile Include="Persistence\Repositories\IPartialViewMacroRepository.cs" />
-    <Compile Include="Persistence\Repositories\IPartialViewRepository.cs" />
     <Compile Include="Persistence\Repositories\IPublicAccessRepository.cs" />
-    <Compile Include="Persistence\IQueryRepository.cs" />
-    <Compile Include="Persistence\IReadRepository.cs" />
-    <Compile Include="Persistence\Repositories\IRedirectUrlRepository.cs" />
-    <Compile Include="Persistence\Repositories\IRelationRepository.cs" />
-    <Compile Include="Persistence\Repositories\IRelationTypeRepository.cs" />
-    <Compile Include="Persistence\IRepository.cs" />
     <Compile Include="Persistence\Repositories\IContentRepository.cs" />
-    <Compile Include="Persistence\Repositories\IScriptRepository.cs" />
-    <Compile Include="Persistence\Repositories\IServerRegistrationRepository.cs" />
-    <Compile Include="Persistence\Repositories\IStylesheetRepository.cs" />
-    <Compile Include="Persistence\Repositories\ITagRepository.cs" />
-    <Compile Include="Persistence\Repositories\ITemplateRepository.cs" />
-    <Compile Include="Persistence\Repositories\IUserGroupRepository.cs" />
-    <Compile Include="Persistence\Repositories\IUserRepository.cs" />
-    <Compile Include="Persistence\IWriteRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\LanguageRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\MacroRepository.cs" />
     <Compile Include="Persistence\Repositories\Implement\MediaRepository.cs" />
@@ -934,22 +869,14 @@
     <Compile Include="Persistence\UmbracoDatabase.cs" />
     <Compile Include="Persistence\UmbracoDatabaseExtensions.cs" />
     <Compile Include="Persistence\UmbracoDatabaseFactory.cs" />
-    <Compile Include="PropertyEditors\Validators\DecimalValidator.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyEditors\DefaultPropertyValueConverterAttribute.cs" />
-    <Compile Include="PropertyEditors\Validators\DelimitedValueValidator.cs" />
-    <Compile Include="PropertyEditors\Validators\EmailValidator.cs" />
-    <Compile Include="PropertyEditors\GridEditor.cs" />
-    <Compile Include="PropertyEditors\Validators\IntegerValidator.cs" />
     <Compile Include="PropertyEditors\IPropertyValueConverter.cs" />
     <Compile Include="PropertyEditors\DataEditor.cs" />
     <Compile Include="PropertyEditors\DataEditorCollection.cs" />
     <Compile Include="PropertyEditors\DataEditorCollectionBuilder.cs" />
     <Compile Include="PropertyEditors\PropertyValueConverterBase.cs" />
     <Compile Include="PropertyEditors\DataValueEditor.cs" />
-    <Compile Include="PropertyEditors\Validators\RegexValidator.cs" />
-    <Compile Include="PropertyEditors\Validators\RequiredValidator.cs" />
-    <Compile Include="PropertyEditors\ManifestValueValidatorCollection.cs" />
-    <Compile Include="PropertyEditors\ManifestValueValidatorCollectionBuilder.cs" />
     <Compile Include="PropertyEditors\ValueConverters\CheckboxListValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\ColorPickerValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\DatePickerValueConverter.cs" />
@@ -1030,22 +957,16 @@
     <Compile Include="Services\Implement\EntityXmlSerializer.cs" />
     <Compile Include="Services\Implement\ExternalLoginService.cs" />
     <Compile Include="Services\Implement\FileService.cs" />
-    <Compile Include="Services\IAuditService.cs" />
     <Compile Include="Services\IContentService.cs" />
-    <Compile Include="Services\IContentServiceBase.cs" />
     <Compile Include="Services\IContentTypeService.cs" />
     <Compile Include="Services\IContentTypeServiceBase.cs" />
     <Compile Include="Services\IdkMap.cs" />
-    <Compile Include="Services\IExternalLoginService.cs" />
     <Compile Include="Services\IMediaService.cs" />
     <Compile Include="Services\IMediaTypeService.cs" />
     <Compile Include="Services\IMemberService.cs" />
-    <Compile Include="Services\IMembershipMemberService.cs" />
-    <Compile Include="Services\IMembershipRoleService.cs" />
     <Compile Include="Services\IMembershipUserService.cs" />
     <Compile Include="Services\IMemberTypeService.cs" />
     <Compile Include="Services\Implement\KeyValueService.cs" />
-    <Compile Include="Services\INotificationService.cs" />
     <Compile Include="Services\IPublicAccessService.cs" />
     <Compile Include="Services\IUserService.cs" />
     <Compile Include="Services\Implement\LocalizationService.cs" />
@@ -1097,21 +1018,6 @@
     <Compile Include="..\SolutionInfo.cs">
       <Link>Properties\SolutionInfo.cs</Link>
     </Compile>
-    <Compile Include="XmlExtensions.cs" />
-    <Compile Include="Xml\DynamicContext.cs" />
-    <Compile Include="Xml\UmbracoXPathPathSyntaxParser.cs" />
-    <Compile Include="Xml\XmlHelper.cs" />
-    <Compile Include="Xml\XmlNamespaces.cs" />
-    <Compile Include="Xml\XmlNodeListFactory.cs" />
-    <Compile Include="Xml\XPathNavigatorExtensions.cs" />
-    <Compile Include="Xml\XPathVariable.cs" />
-    <Compile Include="Xml\XPath\INavigableContent.cs" />
-    <Compile Include="Xml\XPath\INavigableContentType.cs" />
-    <Compile Include="Xml\XPath\INavigableFieldType.cs" />
-    <Compile Include="Xml\XPath\INavigableSource.cs" />
-    <Compile Include="Xml\XPath\MacroNavigator.cs" />
-    <Compile Include="Xml\XPath\NavigableNavigator.cs" />
-    <Compile Include="Xml\XPath\RenamedRootNavigator.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="FileResources\BlockingWeb.config" />
@@ -1129,5 +1035,6 @@
       <Name>Umbraco.Configuration</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Umbraco.Core/Xml/XmlHelper.cs b/src/Umbraco.Core/Xml/XmlHelper.cs
deleted file mode 100644
index 53d56c1aac..0000000000
--- a/src/Umbraco.Core/Xml/XmlHelper.cs
+++ /dev/null
@@ -1,430 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using System.Xml;
-using System.Xml.Linq;
-using System.Xml.XPath;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Exceptions;
-using Umbraco.Core.IO;
-
-namespace Umbraco.Core.Xml
-{
-    /// <summary>
-    /// The XmlHelper class contains general helper methods for working with xml in umbraco.
-    /// </summary>
-    public class XmlHelper
-    {
-        /// <summary>
-        /// Creates or sets an attribute on the XmlNode if an Attributes collection is available
-        /// </summary>
-        /// <param name="xml"></param>
-        /// <param name="n"></param>
-        /// <param name="name"></param>
-        /// <param name="value"></param>
-        public static void SetAttribute(XmlDocument xml, XmlNode n, string name, string value)
-        {
-            if (xml == null) throw new ArgumentNullException("xml");
-            if (n == null) throw new ArgumentNullException("n");
-            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentNullOrEmptyException(nameof(name));
-
-            if (n.Attributes == null)
-            {
-                return;
-            }
-            if (n.Attributes[name] == null)
-            {
-                var a = xml.CreateAttribute(name);
-                a.Value = value;
-                n.Attributes.Append(a);
-            }
-            else
-            {
-                n.Attributes[name].Value = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether a specified string contains only xml whitespace characters.
-        /// </summary>
-        /// <param name="s">The string.</param>
-        /// <returns><c>true</c> if the string contains only xml whitespace characters.</returns>
-        /// <remarks>As per XML 1.1 specs, space, \t, \r and \n.</remarks>
-        public static bool IsXmlWhitespace(string s)
-        {
-            // as per xml 1.1 specs - anything else is significant whitespace
-            s = s.Trim(' ', '\t', '\r', '\n');
-            return s.Length == 0;
-        }
-
-        /// <summary>
-        /// Creates a new <c>XPathDocument</c> from an xml string.
-        /// </summary>
-        /// <param name="xml">The xml string.</param>
-        /// <returns>An <c>XPathDocument</c> created from the xml string.</returns>
-        public static XPathDocument CreateXPathDocument(string xml)
-        {
-            return new XPathDocument(new XmlTextReader(new StringReader(xml)));
-        }
-
-        /// <summary>
-        /// Tries to create a new <c>XPathDocument</c> from an xml string.
-        /// </summary>
-        /// <param name="xml">The xml string.</param>
-        /// <param name="doc">The XPath document.</param>
-        /// <returns>A value indicating whether it has been possible to create the document.</returns>
-        public static bool TryCreateXPathDocument(string xml, out XPathDocument doc)
-        {
-            try
-            {
-                doc = CreateXPathDocument(xml);
-                return true;
-            }
-            catch (Exception)
-            {
-                doc = null;
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Tries to create a new <c>XPathDocument</c> from a property value.
-        /// </summary>
-        /// <param name="value">The value of the property.</param>
-        /// <param name="doc">The XPath document.</param>
-        /// <returns>A value indicating whether it has been possible to create the document.</returns>
-        /// <remarks>The value can be anything... Performance-wise, this is bad.</remarks>
-        public static bool TryCreateXPathDocumentFromPropertyValue(object value, out XPathDocument doc)
-        {
-            // DynamicNode.ConvertPropertyValueByDataType first cleans the value by calling
-            // XmlHelper.StripDashesInElementOrAttributeName - this is because the XML is
-            // to be returned as a DynamicXml and element names such as "value-item" are
-            // invalid and must be converted to "valueitem". But we don't have that sort of
-            // problem here - and we don't need to bother with dashes nor dots, etc.
-
-            doc = null;
-            var xml = value as string;
-            if (xml == null) return false; // no a string
-            if (CouldItBeXml(xml) == false) return false; // string does not look like it's xml
-            if (IsXmlWhitespace(xml)) return false; // string is whitespace, xml-wise
-            if (TryCreateXPathDocument(xml, out doc) == false) return false; // string can't be parsed into xml
-
-            var nav = doc.CreateNavigator();
-            if (nav.MoveToFirstChild())
-            {
-                //SD: This used to do this but the razor macros and the entire razor macros section is gone, it was all legacy, it seems this method isn't even
-                // used apart from for tests so don't think this matters. In any case, we no longer check for this!
-
-                //var name = nav.LocalName; // must not match an excluded tag
-                //if (UmbracoConfig.For.UmbracoSettings().Scripting.NotDynamicXmlDocumentElements.All(x => x.Element.InvariantEquals(name) == false)) return true;
-
-                return true;
-            }
-
-            doc = null;
-            return false;
-        }
-
-
-        /// <summary>
-        /// Sorts the children of a parentNode.
-        /// </summary>
-        /// <param name="parentNode">The parent node.</param>
-        /// <param name="childNodesXPath">An XPath expression to select children of <paramref name="parentNode"/> to sort.</param>
-        /// <param name="orderBy">A function returning the value to order the nodes by.</param>
-        internal static void SortNodes(
-            XmlNode parentNode,
-            string childNodesXPath,
-            Func<XmlNode, int> orderBy)
-        {
-            var sortedChildNodes = parentNode.SelectNodes(childNodesXPath).Cast<XmlNode>()
-                .OrderBy(orderBy)
-                .ToArray();
-
-            // append child nodes to last position, in sort-order
-            // so all child nodes will go after the property nodes
-            foreach (var node in sortedChildNodes)
-                parentNode.AppendChild(node); // moves the node to the last position
-        }
-
-
-        /// <summary>
-        /// Sorts a single child node of a parentNode.
-        /// </summary>
-        /// <param name="parentNode">The parent node.</param>
-        /// <param name="childNodesXPath">An XPath expression to select children of <paramref name="parentNode"/> to sort.</param>
-        /// <param name="node">The child node to sort.</param>
-        /// <param name="orderBy">A function returning the value to order the nodes by.</param>
-        /// <returns>A value indicating whether sorting was needed.</returns>
-        /// <remarks>Assuming all nodes but <paramref name="node"/> are sorted, this will move the node to
-        /// the right position without moving all the nodes (as SortNodes would do) - should improve perfs.</remarks>
-        internal static bool SortNode(
-            XmlNode parentNode,
-            string childNodesXPath,
-            XmlNode node,
-            Func<XmlNode, int> orderBy)
-        {
-            var nodeSortOrder = orderBy(node);
-            var childNodesAndOrder = parentNode.SelectNodes(childNodesXPath).Cast<XmlNode>()
-                .Select(x => Tuple.Create(x, orderBy(x))).ToArray();
-
-            // only one node = node is in the right place already, obviously
-            if (childNodesAndOrder.Length == 1) return false;
-
-            // find the first node with a sortOrder > node.sortOrder
-            var i = 0;
-            while (i < childNodesAndOrder.Length && childNodesAndOrder[i].Item2 <= nodeSortOrder)
-               i++;
-
-            // if one was found
-            if (i < childNodesAndOrder.Length)
-            {
-                // and node is just before, we're done already
-                // else we need to move it right before the node that was found
-                if (i == 0 || childNodesAndOrder[i - 1].Item1 != node)
-                {
-                    parentNode.InsertBefore(node, childNodesAndOrder[i].Item1);
-                    return true;
-                }
-            }
-            else // i == childNodesAndOrder.Length && childNodesAndOrder.Length > 1
-            {
-                // and node is the last one, we're done already
-                // else we need to append it as the last one
-                // (and i > 1, see above)
-                if (childNodesAndOrder[i - 1].Item1 != node)
-                {
-                    parentNode.AppendChild(node);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-
-        /// <summary>
-        /// Opens a file as a XmlDocument.
-        /// </summary>
-        /// <param name="filePath">The relative file path. ie. /config/umbraco.config</param>
-        /// <returns>Returns a XmlDocument class</returns>
-        public static XmlDocument OpenAsXmlDocument(string filePath)
-        {
-            using (var reader = new XmlTextReader(Current.IOHelper.MapPath(filePath)) {WhitespaceHandling = WhitespaceHandling.All})
-            {
-                var xmlDoc = new XmlDocument();
-                //Load the file into the XmlDocument
-                xmlDoc.Load(reader);
-
-                return xmlDoc;
-            }
-        }
-
-        /// <summary>
-        /// creates a XmlAttribute with the specified name and value
-        /// </summary>
-        /// <param name="xd">The xmldocument.</param>
-        /// <param name="name">The name of the attribute.</param>
-        /// <param name="value">The value of the attribute.</param>
-        /// <returns>a XmlAttribute</returns>
-        public static XmlAttribute AddAttribute(XmlDocument xd, string name, string value)
-        {
-            if (xd == null) throw new ArgumentNullException("xd");
-            if (string.IsNullOrEmpty(name)) throw new ArgumentNullOrEmptyException(nameof(name));
-
-            var temp = xd.CreateAttribute(name);
-            temp.Value = value;
-            return temp;
-        }
-
-        /// <summary>
-        /// Creates a text XmlNode with the specified name and value
-        /// </summary>
-        /// <param name="xd">The xmldocument.</param>
-        /// <param name="name">The node name.</param>
-        /// <param name="value">The node value.</param>
-        /// <returns>a XmlNode</returns>
-        public static XmlNode AddTextNode(XmlDocument xd, string name, string value)
-        {
-            if (xd == null) throw new ArgumentNullException("xd");
-            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentNullOrEmptyException(nameof(name));
-
-            var temp = xd.CreateNode(XmlNodeType.Element, name, "");
-            temp.AppendChild(xd.CreateTextNode(value));
-            return temp;
-        }
-
-        /// <summary>
-        /// Sets or Creates a text XmlNode with the specified name and value
-        /// </summary>
-        /// <param name="xd">The xmldocument.</param>
-        /// <param name="parent">The node to set or create the child text node on</param>
-        /// <param name="name">The node name.</param>
-        /// <param name="value">The node value.</param>
-        /// <returns>a XmlNode</returns>
-        public static XmlNode SetTextNode(XmlDocument xd, XmlNode parent, string name, string value)
-        {
-            if (xd == null) throw new ArgumentNullException("xd");
-            if (parent == null) throw new ArgumentNullException("parent");
-            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentNullOrEmptyException(nameof(name));
-
-            var child = parent.SelectSingleNode(name);
-            if (child != null)
-            {
-                child.InnerText = value;
-                return child;
-            }
-            return AddTextNode(xd, name, value);
-        }
-
-        /// <summary>
-        /// Sets or creates an Xml node from its inner Xml.
-        /// </summary>
-        /// <param name="xd">The xmldocument.</param>
-        /// <param name="parent">The node to set or create the child text node on</param>
-        /// <param name="name">The node name.</param>
-        /// <param name="value">The node inner Xml.</param>
-        /// <returns>a XmlNode</returns>
-        public static XmlNode SetInnerXmlNode(XmlDocument xd, XmlNode parent, string name, string value)
-        {
-            if (xd == null) throw new ArgumentNullException(nameof(xd));
-            if (parent == null) throw new ArgumentNullException(nameof(parent));
-            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentException("Value cannot be null or whitespace.", nameof(name));
-
-            var child = parent.SelectSingleNode(name) ?? xd.CreateNode(XmlNodeType.Element, name, "");
-            child.InnerXml = value;
-            return child;
-        }
-
-        /// <summary>
-        /// Creates a cdata XmlNode with the specified name and value
-        /// </summary>
-        /// <param name="xd">The xmldocument.</param>
-        /// <param name="name">The node name.</param>
-        /// <param name="value">The node value.</param>
-        /// <returns>A XmlNode</returns>
-        public static XmlNode AddCDataNode(XmlDocument xd, string name, string value)
-        {
-            if (xd == null) throw new ArgumentNullException("xd");
-            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentNullOrEmptyException(nameof(name));
-
-            var temp = xd.CreateNode(XmlNodeType.Element, name, "");
-            temp.AppendChild(xd.CreateCDataSection(value));
-            return temp;
-        }
-
-        /// <summary>
-        /// Sets or Creates a cdata XmlNode with the specified name and value
-        /// </summary>
-        /// <param name="xd">The xmldocument.</param>
-        /// <param name="parent">The node to set or create the child text node on</param>
-        /// <param name="name">The node name.</param>
-        /// <param name="value">The node value.</param>
-        /// <returns>a XmlNode</returns>
-        public static XmlNode SetCDataNode(XmlDocument xd, XmlNode parent, string name, string value)
-        {
-            if (xd == null) throw new ArgumentNullException("xd");
-            if (parent == null) throw new ArgumentNullException("parent");
-            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentNullOrEmptyException(nameof(name));
-
-            var child = parent.SelectSingleNode(name);
-            if (child != null)
-            {
-                child.InnerXml = "<![CDATA[" + value + "]]>"; ;
-                return child;
-            }
-            return AddCDataNode(xd, name, value);
-        }
-
-        /// <summary>
-        /// Gets the value of a XmlNode
-        /// </summary>
-        /// <param name="n">The XmlNode.</param>
-        /// <returns>the value as a string</returns>
-        internal static string GetNodeValue(XmlNode n)
-        {
-            var value = string.Empty;
-            if (n == null || n.FirstChild == null)
-                return value;
-            value = n.FirstChild.Value ?? n.InnerXml;
-            return value.Replace("<!--CDATAOPENTAG-->", "<![CDATA[").Replace("<!--CDATACLOSETAG-->", "]]>");
-        }
-
-        /// <summary>
-        /// Determines whether the specified string appears to be XML.
-        /// </summary>
-        /// <param name="xml">The XML string.</param>
-        /// <returns>
-        ///     <c>true</c> if the specified string appears to be XML; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool CouldItBeXml(string xml)
-        {
-            if (string.IsNullOrEmpty(xml)) return false;
-
-            xml = xml.Trim();
-            return xml.StartsWith("<") && xml.EndsWith(">") && xml.Contains('/');
-        }
-
-        /// <summary>
-        /// Splits the specified delimited string into an XML document.
-        /// </summary>
-        /// <param name="data">The data.</param>
-        /// <param name="separator">The separator.</param>
-        /// <param name="rootName">Name of the root.</param>
-        /// <param name="elementName">Name of the element.</param>
-        /// <returns>Returns an <c>System.Xml.XmlDocument</c> representation of the delimited string data.</returns>
-        internal static XmlDocument Split(string data, string[] separator, string rootName, string elementName)
-        {
-            return Split(new XmlDocument(), data, separator, rootName, elementName);
-        }
-
-        /// <summary>
-        /// Splits the specified delimited string into an XML document.
-        /// </summary>
-        /// <param name="xml">The XML document.</param>
-        /// <param name="data">The delimited string data.</param>
-        /// <param name="separator">The separator.</param>
-        /// <param name="rootName">Name of the root node.</param>
-        /// <param name="elementName">Name of the element node.</param>
-        /// <returns>Returns an <c>System.Xml.XmlDocument</c> representation of the delimited string data.</returns>
-        internal static XmlDocument Split(XmlDocument xml, string data, string[] separator, string rootName, string elementName)
-        {
-            // load new XML document.
-            xml.LoadXml(string.Concat("<", rootName, "/>"));
-
-            // get the data-value, check it isn't empty.
-            if (!string.IsNullOrEmpty(data))
-            {
-                // explode the values into an array
-                var values = data.Split(separator, StringSplitOptions.None);
-
-                // loop through the array items.
-                foreach (string value in values)
-                {
-                    // add each value to the XML document.
-                    var xn = XmlHelper.AddTextNode(xml, elementName, value);
-                    xml.DocumentElement.AppendChild(xn);
-                }
-            }
-
-            // return the XML node.
-            return xml;
-        }
-
-        /// <summary>
-        /// Return a dictionary of attributes found for a string based tag
-        /// </summary>
-        /// <param name="tag"></param>
-        /// <returns></returns>
-        internal static Dictionary<string, string> GetAttributesFromElement(string tag)
-        {
-            var m =
-                Regex.Matches(tag, "(?<attributeName>\\S*)=\"(?<attributeValue>[^\"]*)\"",
-                              RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
-            // fix for issue 14862: return lowercase attributes for case insensitive matching
-            var d = m.Cast<Match>().ToDictionary(attributeSet => attributeSet.Groups["attributeName"].Value.ToString().ToLower(), attributeSet => attributeSet.Groups["attributeValue"].Value.ToString());
-            return d;
-        }
-    }
-}
diff --git a/src/Umbraco.Examine/BaseValueSetBuilder.cs b/src/Umbraco.Examine/BaseValueSetBuilder.cs
index 93cee88231..4a306aa5ff 100644
--- a/src/Umbraco.Examine/BaseValueSetBuilder.cs
+++ b/src/Umbraco.Examine/BaseValueSetBuilder.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Examine
         /// <inheritdoc />
         public abstract IEnumerable<ValueSet> GetValueSets(params TContent[] content);
 
-        protected void AddPropertyValue(Property property, string culture, string segment, IDictionary<string, IEnumerable<object>> values)
+        protected void AddPropertyValue(IProperty property, string culture, string segment, IDictionary<string, IEnumerable<object>> values)
         {
             var editor = _propertyEditors[property.PropertyType.PropertyEditorAlias];
             if (editor == null) return;
@@ -61,7 +61,7 @@ namespace Umbraco.Examine
                                 else
                                     values.Add($"{keyVal.Key}{cultureSuffix}", val.Yield());
                             }
-                            
+
                             break;
                     }
                 }
diff --git a/src/Umbraco.Examine/LuceneIndexCreator.cs b/src/Umbraco.Examine/LuceneIndexCreator.cs
index ca5aacfabc..3834c1476e 100644
--- a/src/Umbraco.Examine/LuceneIndexCreator.cs
+++ b/src/Umbraco.Examine/LuceneIndexCreator.cs
@@ -17,6 +17,13 @@ namespace Umbraco.Examine
     /// </summary>
     public abstract class LuceneIndexCreator : IIndexCreator
     {
+        private readonly ITypeFinder _typeFinder;
+
+        protected LuceneIndexCreator(ITypeFinder typeFinder)
+        {
+            _typeFinder = typeFinder;
+        }
+
         public abstract IEnumerable<IIndex> Create();
 
         /// <summary>
@@ -38,7 +45,7 @@ namespace Umbraco.Examine
             if (!configuredDirectoryFactory.IsNullOrWhiteSpace())
             {
                 //this should be a fully qualified type
-                var factoryType = TypeFinder.GetTypeByName(configuredDirectoryFactory);
+                var factoryType = _typeFinder.GetTypeByName(configuredDirectoryFactory);
                 if (factoryType == null) throw new NullReferenceException("No directory type found for value: " + configuredDirectoryFactory);
                 var directoryFactory = (IDirectoryFactory)Activator.CreateInstance(factoryType);
                 return directoryFactory.CreateDirectory(dirInfo);
diff --git a/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
index 67919834ac..eb61e2a2c8 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
+++ b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
@@ -34,7 +34,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web" />
@@ -97,6 +96,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="System.ComponentModel.Annotations">
+      <Version>4.6.0</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj">
diff --git a/src/Umbraco.Tests/App.config b/src/Umbraco.Tests/App.config
index 91047ba6a2..9eeb93384d 100644
--- a/src/Umbraco.Tests/App.config
+++ b/src/Umbraco.Tests/App.config
@@ -94,6 +94,10 @@
                 <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35"/>
                 <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
             </dependentAssembly>
+          <dependentAssembly>
+              <assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+              <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
+          </dependentAssembly>
       </assemblyBinding>
   </runtime>
 
diff --git a/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs b/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs
index 13fabe5ca2..77200be86e 100644
--- a/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/DeepCloneAppCacheTests.cs
@@ -2,13 +2,17 @@
 using System.Diagnostics;
 using System.Reflection;
 using System.Web;
+using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Collections;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Tests.Collections;
+using Umbraco.Web.Cache;
 
 namespace Umbraco.Tests.Cache
 {
@@ -22,7 +26,8 @@ namespace Umbraco.Tests.Cache
         public override void Setup()
         {
             base.Setup();
-            _provider = new DeepCloneAppCache(new WebCachingAppCache(HttpRuntime.Cache));
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            _provider = new DeepCloneAppCache(new WebCachingAppCache(HttpRuntime.Cache, typeFinder));
         }
 
         internal override IAppCache AppCache => _provider;
diff --git a/src/Umbraco.Tests/Cache/DistributedCache/DistributedCacheTests.cs b/src/Umbraco.Tests/Cache/DistributedCache/DistributedCacheTests.cs
index 33a1aa16a5..46b936c1ae 100644
--- a/src/Umbraco.Tests/Cache/DistributedCache/DistributedCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/DistributedCache/DistributedCacheTests.cs
@@ -6,10 +6,10 @@ using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Sync;
 using Umbraco.Tests.Components;
+using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.Cache.DistributedCache
 {
@@ -26,7 +26,7 @@ namespace Umbraco.Tests.Cache.DistributedCache
         {
             var register = RegisterFactory.Create();
 
-            var composition = new Composition(register, new TypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), new ConfigsFactory().Create());
+            var composition = new Composition(register, TestHelper.GetMockedTypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), TestHelper.GetConfigs());
 
             composition.RegisterUnique<IServerRegistrar>(_ => new TestServerRegistrar());
             composition.RegisterUnique<IServerMessenger>(_ => new TestServerMessenger());
@@ -35,7 +35,6 @@ namespace Umbraco.Tests.Cache.DistributedCache
                 .Add<TestCacheRefresher>();
 
             Current.Factory = composition.CreateFactory();
-            CurrentCore.Factory = composition.CreateFactory();
 
             _distributedCache = new Umbraco.Web.Cache.DistributedCache();
         }
diff --git a/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs b/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
index e446e049b6..17d1d1b4cb 100644
--- a/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
+++ b/src/Umbraco.Tests/Cache/DistributedCacheBinderTests.cs
@@ -60,8 +60,8 @@ namespace Umbraco.Tests.Cache
                 new EventDefinition<IDataTypeService, SaveEventArgs<IDataType>>(null, serviceContext.DataTypeService, new SaveEventArgs<IDataType>(Enumerable.Empty<IDataType>())),
                 new EventDefinition<IDataTypeService, DeleteEventArgs<IDataType>>(null, serviceContext.DataTypeService, new DeleteEventArgs<IDataType>(Enumerable.Empty<IDataType>())),
 
-                new EventDefinition<IFileService, SaveEventArgs<Stylesheet>>(null, serviceContext.FileService, new SaveEventArgs<Stylesheet>(Enumerable.Empty<Stylesheet>())),
-                new EventDefinition<IFileService, DeleteEventArgs<Stylesheet>>(null, serviceContext.FileService, new DeleteEventArgs<Stylesheet>(Enumerable.Empty<Stylesheet>())),
+                new EventDefinition<IFileService, SaveEventArgs<IStylesheet>>(null, serviceContext.FileService, new SaveEventArgs<IStylesheet>(Enumerable.Empty<IStylesheet>())),
+                new EventDefinition<IFileService, DeleteEventArgs<IStylesheet>>(null, serviceContext.FileService, new DeleteEventArgs<IStylesheet>(Enumerable.Empty<IStylesheet>())),
 
                 new EventDefinition<IDomainService, SaveEventArgs<IDomain>>(null, serviceContext.DomainService, new SaveEventArgs<IDomain>(Enumerable.Empty<IDomain>())),
                 new EventDefinition<IDomainService, DeleteEventArgs<IDomain>>(null, serviceContext.DomainService, new DeleteEventArgs<IDomain>(Enumerable.Empty<IDomain>())),
diff --git a/src/Umbraco.Tests/Cache/HttpRequestAppCacheTests.cs b/src/Umbraco.Tests/Cache/HttpRequestAppCacheTests.cs
index 042830e059..b9c948c1de 100644
--- a/src/Umbraco.Tests/Cache/HttpRequestAppCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/HttpRequestAppCacheTests.cs
@@ -1,5 +1,8 @@
-using NUnit.Framework;
+using Moq;
+using NUnit.Framework;
 using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Logging;
 using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.Cache
@@ -13,8 +16,9 @@ namespace Umbraco.Tests.Cache
         public override void Setup()
         {
             base.Setup();
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
             _ctx = new FakeHttpContextFactory("http://localhost/test");
-            _appCache = new HttpRequestAppCache(_ctx.HttpContext);
+            _appCache = new HttpRequestAppCache(() => _ctx.HttpContext.Items, typeFinder);
         }
 
         internal override IAppCache AppCache
diff --git a/src/Umbraco.Tests/Cache/ObjectAppCacheTests.cs b/src/Umbraco.Tests/Cache/ObjectAppCacheTests.cs
index b9c729f891..0fb8e574a8 100644
--- a/src/Umbraco.Tests/Cache/ObjectAppCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/ObjectAppCacheTests.cs
@@ -1,9 +1,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Logging;
 
 namespace Umbraco.Tests.Cache
 {
@@ -20,7 +23,8 @@ namespace Umbraco.Tests.Cache
         public override void Setup()
         {
             base.Setup();
-            _provider = new ObjectCacheAppCache();
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            _provider = new ObjectCacheAppCache(typeFinder);
         }
 
         internal override IAppCache AppCache
diff --git a/src/Umbraco.Tests/Cache/WebCachingAppCacheTests.cs b/src/Umbraco.Tests/Cache/WebCachingAppCacheTests.cs
index e732ae5766..02986e2f78 100644
--- a/src/Umbraco.Tests/Cache/WebCachingAppCacheTests.cs
+++ b/src/Umbraco.Tests/Cache/WebCachingAppCacheTests.cs
@@ -1,8 +1,12 @@
 using System;
 using System.Diagnostics;
 using System.Web;
+using Moq;
 using NUnit.Framework;
 using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Logging;
+using Umbraco.Web.Cache;
 
 namespace Umbraco.Tests.Cache
 {
@@ -16,7 +20,8 @@ namespace Umbraco.Tests.Cache
         public override void Setup()
         {
             base.Setup();
-            _appCache = new WebCachingAppCache(HttpRuntime.Cache);
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            _appCache = new WebCachingAppCache(HttpRuntime.Cache, typeFinder);
         }
 
         internal override IAppCache AppCache => _appCache;
diff --git a/src/Umbraco.Tests/Components/ComponentTests.cs b/src/Umbraco.Tests/Components/ComponentTests.cs
index b8f3d56778..a57eb9a823 100644
--- a/src/Umbraco.Tests/Components/ComponentTests.cs
+++ b/src/Umbraco.Tests/Components/ComponentTests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using Moq;
 using NUnit.Framework;
@@ -33,9 +34,10 @@ namespace Umbraco.Tests.Components
             var mock = new Mock<IFactory>();
 
             var logger = Mock.Of<ILogger>();
+            var typeFinder = new TypeFinder(logger);
             var f = new UmbracoDatabaseFactory(logger, new Lazy<IMapperCollection>(() => new MapperCollection(Enumerable.Empty<BaseMapper>())));
             var fs = new FileSystems(mock.Object, logger);
-            var p = new ScopeProvider(f, fs, logger);
+            var p = new ScopeProvider(f, fs, logger, typeFinder);
 
             mock.Setup(x => x.GetInstance(typeof (ILogger))).Returns(logger);
             mock.Setup(x => x.GetInstance(typeof (IProfilingLogger))).Returns(new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
@@ -53,7 +55,8 @@ namespace Umbraco.Tests.Components
 
         private static TypeLoader MockTypeLoader()
         {
-            return new TypeLoader();
+            var ioHelper = IOHelper.Default;
+            return new TypeLoader(ioHelper, Mock.Of<ITypeFinder>(), Mock.Of<IAppPolicyCache>(), new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), Mock.Of<IProfilingLogger>());
         }
 
         public static IRuntimeState MockRuntimeState(RuntimeLevel level)
@@ -363,7 +366,9 @@ namespace Umbraco.Tests.Components
         [Test]
         public void AllComposers()
         {
-            var typeLoader = new TypeLoader(AppCaches.Disabled.RuntimeCache, Current.IOHelper.MapPath("~/App_Data/TEMP"), Mock.Of<IProfilingLogger>());
+            var ioHelper = IOHelper.Default;
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var typeLoader = new TypeLoader(ioHelper, typeFinder, AppCaches.Disabled.RuntimeCache, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), Mock.Of<IProfilingLogger>());
 
             var register = MockRegister();
             var composition = new Composition(register, typeLoader, Mock.Of<IProfilingLogger>(), MockRuntimeState(RuntimeLevel.Run), Configs);
diff --git a/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs b/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs
index 25d46a3cdc..91f1b42b8c 100644
--- a/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs
+++ b/src/Umbraco.Tests/Composing/CollectionBuildersTests.cs
@@ -8,6 +8,7 @@ using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Tests.Components;
+using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.Composing
 {
@@ -22,7 +23,7 @@ namespace Umbraco.Tests.Composing
             Current.Reset();
 
             var register = RegisterFactory.Create();
-            _composition = new Composition(register, new TypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), new ConfigsFactory().Create());
+            _composition = new Composition(register, TestHelper.GetMockedTypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), TestHelper.GetConfigs());
         }
 
         [TearDown]
diff --git a/src/Umbraco.Tests/Composing/ComposingTestBase.cs b/src/Umbraco.Tests/Composing/ComposingTestBase.cs
index f7d2c869b4..8a0dc46e7f 100644
--- a/src/Umbraco.Tests/Composing/ComposingTestBase.cs
+++ b/src/Umbraco.Tests/Composing/ComposingTestBase.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.IO;
 using System.Reflection;
 using Moq;
 using NUnit.Framework;
@@ -22,10 +23,9 @@ namespace Umbraco.Tests.Composing
         {
             ProfilingLogger = new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
 
-            TypeLoader = new TypeLoader(NoAppCache.Instance, Current.IOHelper.MapPath("~/App_Data/TEMP"), ProfilingLogger, detectChanges: false)
-            {
-                AssembliesToScan = AssembliesToScan
-            };
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var ioHelper = IOHelper.Default;
+            TypeLoader = new TypeLoader(ioHelper, typeFinder, NoAppCache.Instance, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), ProfilingLogger, false, AssembliesToScan);
         }
 
         [TearDown]
diff --git a/src/Umbraco.Tests/Composing/CompositionTests.cs b/src/Umbraco.Tests/Composing/CompositionTests.cs
index 71f0007979..560f79fb24 100644
--- a/src/Umbraco.Tests/Composing/CompositionTests.cs
+++ b/src/Umbraco.Tests/Composing/CompositionTests.cs
@@ -1,12 +1,13 @@
 using System;
+using System.IO;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
+using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.Composing
 {
@@ -37,8 +38,10 @@ namespace Umbraco.Tests.Composing
                 .Returns(() => factoryFactory?.Invoke(mockedFactory));
 
             var logger = new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
-            var typeLoader = new TypeLoader(Mock.Of<IAppPolicyCache>(), Current.IOHelper.MapPath("~/App_Data/TEMP"), logger);
-            var composition = new Composition(mockedRegister, typeLoader, logger, Mock.Of<IRuntimeState>(), new ConfigsFactory().Create());
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var ioHelper = IOHelper.Default;
+            var typeLoader = new TypeLoader(ioHelper, typeFinder, Mock.Of<IAppPolicyCache>(), new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), logger);
+            var composition = new Composition(mockedRegister, typeLoader, logger, Mock.Of<IRuntimeState>(), TestHelper.GetConfigs());
 
             // create the factory, ensure it is the mocked factory
             var factory = composition.CreateFactory();
diff --git a/src/Umbraco.Tests/Composing/LazyCollectionBuilderTests.cs b/src/Umbraco.Tests/Composing/LazyCollectionBuilderTests.cs
index 69e8524b7c..7143db6c70 100644
--- a/src/Umbraco.Tests/Composing/LazyCollectionBuilderTests.cs
+++ b/src/Umbraco.Tests/Composing/LazyCollectionBuilderTests.cs
@@ -9,6 +9,7 @@ using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Tests.Components;
+using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.Composing
 {
@@ -40,7 +41,7 @@ namespace Umbraco.Tests.Composing
         public void LazyCollectionBuilderHandlesTypes()
         {
             var container = CreateRegister();
-            var composition = new Composition(container, new TypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), new ConfigsFactory().Create());
+            var composition = new Composition(container, TestHelper.GetMockedTypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), TestHelper.GetConfigs());
 
             composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Add<TransientObject3>()
@@ -66,7 +67,7 @@ namespace Umbraco.Tests.Composing
         public void LazyCollectionBuilderHandlesProducers()
         {
             var container = CreateRegister();
-            var composition = new Composition(container, new TypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), new ConfigsFactory().Create());
+            var composition = new Composition(container, TestHelper.GetMockedTypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), TestHelper.GetConfigs());
 
             composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Add(() => new[] { typeof(TransientObject3), typeof(TransientObject2) })
@@ -91,7 +92,7 @@ namespace Umbraco.Tests.Composing
         public void LazyCollectionBuilderHandlesTypesAndProducers()
         {
             var container = CreateRegister();
-            var composition = new Composition(container, new TypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), new ConfigsFactory().Create());
+            var composition = new Composition(container, TestHelper.GetMockedTypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), TestHelper.GetConfigs());
 
             composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Add<TransientObject3>()
@@ -117,7 +118,7 @@ namespace Umbraco.Tests.Composing
         public void LazyCollectionBuilderThrowsOnIllegalTypes()
         {
             var container = CreateRegister();
-            var composition = new Composition(container, new TypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), new ConfigsFactory().Create());
+            var composition = new Composition(container, TestHelper.GetMockedTypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), TestHelper.GetConfigs());
 
             composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Add<TransientObject3>()
@@ -139,7 +140,7 @@ namespace Umbraco.Tests.Composing
         public void LazyCollectionBuilderCanExcludeTypes()
         {
             var container = CreateRegister();
-            var composition = new Composition(container, new TypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), new ConfigsFactory().Create());
+            var composition = new Composition(container, TestHelper.GetMockedTypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), TestHelper.GetConfigs());
 
             composition.WithCollectionBuilder<TestCollectionBuilder>()
                 .Add<TransientObject3>()
diff --git a/src/Umbraco.Tests/Composing/PackageActionCollectionTests.cs b/src/Umbraco.Tests/Composing/PackageActionCollectionTests.cs
index bf79b340dc..bbe65c39aa 100644
--- a/src/Umbraco.Tests/Composing/PackageActionCollectionTests.cs
+++ b/src/Umbraco.Tests/Composing/PackageActionCollectionTests.cs
@@ -6,10 +6,10 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PackageActions;
 using Umbraco.Tests.Components;
+using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.Composing
 {
@@ -21,13 +21,12 @@ namespace Umbraco.Tests.Composing
         {
             var container = RegisterFactory.Create();
 
-            var composition = new Composition(container, new TypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), new ConfigsFactory().Create());
+            var composition = new Composition(container, TestHelper.GetMockedTypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), TestHelper.GetConfigs());
 
             composition.WithCollectionBuilder<PackageActionCollectionBuilder>()
                 .Add(() => TypeLoader.GetPackageActions());
 
             Current.Factory = composition.CreateFactory();
-            CurrentCore.Factory = composition.CreateFactory();
 
             var actions = Current.PackageActions;
             Assert.AreEqual(2, actions.Count());
diff --git a/src/Umbraco.Tests/Composing/TypeFinderTests.cs b/src/Umbraco.Tests/Composing/TypeFinderTests.cs
index a3df6bf697..5fe4c241d6 100644
--- a/src/Umbraco.Tests/Composing/TypeFinderTests.cs
+++ b/src/Umbraco.Tests/Composing/TypeFinderTests.cs
@@ -10,6 +10,7 @@ using System.Text;
 using System.Threading;
 using System.Web;
 using System.Web.Compilation;
+using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
@@ -56,39 +57,19 @@ namespace Umbraco.Tests.Composing
         [Test]
         public void Find_Class_Of_Type_With_Attribute()
         {
-
-            var typesFound = TypeFinder.FindClassesOfTypeWithAttribute<TestEditor, MyTestAttribute>(_assemblies);
+            var typeFinder = new TypeFinder(GetTestProfilingLogger());
+            var typesFound = typeFinder.FindClassesOfTypeWithAttribute<TestEditor, MyTestAttribute>(_assemblies);
             Assert.AreEqual(2, typesFound.Count());
         }
 
-        //[Test]
-        //public void Find_Classes_Of_Type()
-        //{
-        //    var typesFound = TypeFinder.FindClassesOfType<IApplicationEventHandler>(_assemblies);
-        //    var originalTypesFound = TypeFinderOriginal.FindClassesOfType<IApplicationEventHandler>(_assemblies);
-
-        //    foreach (var type in typesFound)
-        //        Console.WriteLine(type);
-        //    Console.WriteLine();
-        //    foreach (var type in originalTypesFound)
-        //        Console.WriteLine(type);
-
-        //    // 6 classes in _assemblies implement IApplicationEventHandler
-        //    Assert.AreEqual(6, typesFound.Count());
-
-        //    // however,
-        //    // Umbraco.Core.Profiling.WebProfiler is internal and is not returned by TypeFinderOriginal,
-        //    // that's a known issue of the legacy type finder, so we have to tweak the count here.
-        //    Assert.AreEqual(5, originalTypesFound.Count());
-        //}
-
         [Test]
         public void Find_Classes_With_Attribute()
         {
-            var typesFound = TypeFinder.FindClassesWithAttribute<TreeAttribute>(_assemblies);
+            var typeFinder = new TypeFinder(GetTestProfilingLogger());
+            var typesFound = typeFinder.FindClassesWithAttribute<TreeAttribute>(_assemblies);
             Assert.AreEqual(0, typesFound.Count()); // 0 classes in _assemblies are marked with [Tree]
 
-            typesFound = TypeFinder.FindClassesWithAttribute<TreeAttribute>(new[] { typeof (UmbracoContext).Assembly });
+            typesFound = typeFinder.FindClassesWithAttribute<TreeAttribute>(new[] { typeof (UmbracoContext).Assembly });
             Assert.AreEqual(22, typesFound.Count()); // + classes in Umbraco.Web are marked with [Tree]
         }
 
@@ -122,447 +103,6 @@ namespace Umbraco.Tests.Composing
 
         }
 
-        //USED FOR THE ABOVE TESTS
-        // see this issue for details: http://issues.umbraco.org/issue/U4-1187
-        internal static class TypeFinderOriginal
-        {
-
-            private static readonly ConcurrentBag<Assembly> LocalFilteredAssemblyCache = new ConcurrentBag<Assembly>();
-            private static readonly ReaderWriterLockSlim LocalFilteredAssemblyCacheLocker = new ReaderWriterLockSlim();
-            private static ReadOnlyCollection<Assembly> _allAssemblies = null;
-            private static ReadOnlyCollection<Assembly> _binFolderAssemblies = null;
-            private static readonly ReaderWriterLockSlim Locker = new ReaderWriterLockSlim();
-
-            /// <summary>
-            /// lazily load a reference to all assemblies and only local assemblies.
-            /// This is a modified version of: http://www.dominicpettifer.co.uk/Blog/44/how-to-get-a-reference-to-all-assemblies-in-the--bin-folder
-            /// </summary>
-            /// <remarks>
-            /// We do this because we cannot use AppDomain.Current.GetAssemblies() as this will return only assemblies that have been
-            /// loaded in the CLR, not all assemblies.
-            /// See these threads:
-            /// http://issues.umbraco.org/issue/U5-198
-            /// http://stackoverflow.com/questions/3552223/asp-net-appdomain-currentdomain-getassemblies-assemblies-missing-after-app
-            /// http://stackoverflow.com/questions/2477787/difference-between-appdomain-getassemblies-and-buildmanager-getreferencedassembl
-            /// </remarks>
-            internal static IEnumerable<Assembly> GetAllAssemblies()
-            {
-                if (_allAssemblies == null)
-                {
-                    using (new WriteLock(Locker))
-                    {
-                        List<Assembly> assemblies = null;
-                        try
-                        {
-                            var isHosted = HttpContext.Current != null;
-
-                            try
-                            {
-                                if (isHosted)
-                                {
-                                    assemblies = new List<Assembly>(BuildManager.GetReferencedAssemblies().Cast<Assembly>());
-                                }
-                            }
-                            catch (InvalidOperationException e)
-                            {
-                                if (!(e.InnerException is SecurityException))
-                                    throw;
-                            }
-
-
-                            if (assemblies == null)
-                            {
-                                //NOTE: we cannot use AppDomain.CurrentDomain.GetAssemblies() because this only returns assemblies that have
-                                // already been loaded in to the app domain, instead we will look directly into the bin folder and load each one.
-                                var binFolder = Assembly.GetExecutingAssembly().GetAssemblyFile().Directory;
-                                var binAssemblyFiles = Directory.GetFiles(binFolder.FullName, "*.dll", SearchOption.TopDirectoryOnly).ToList();
-                                assemblies = new List<Assembly>();
-                                foreach (var a in binAssemblyFiles)
-                                {
-                                    try
-                                    {
-                                        var assName = AssemblyName.GetAssemblyName(a);
-                                        var ass = Assembly.Load(assName);
-                                        assemblies.Add(ass);
-                                    }
-                                    catch (Exception e)
-                                    {
-                                        if (e is SecurityException || e is BadImageFormatException)
-                                        {
-                                            //swallow these exceptions
-                                        }
-                                        else
-                                        {
-                                            throw;
-                                        }
-                                    }
-                                }
-                            }
-
-                            //if for some reason they are still no assemblies, then use the AppDomain to load in already loaded assemblies.
-                            if (!assemblies.Any())
-                            {
-                                assemblies.AddRange(AppDomain.CurrentDomain.GetAssemblies().ToList());
-                            }
-
-                            //here we are trying to get the App_Code assembly
-                            var fileExtensions = new[] { ".cs", ".vb" }; //only vb and cs files are supported
-                            var appCodeFolder = new DirectoryInfo(Current.IOHelper.MapPath(Current.IOHelper.ResolveUrl("~/App_code")));
-                            //check if the folder exists and if there are any files in it with the supported file extensions
-                            if (appCodeFolder.Exists && (fileExtensions.Any(x => appCodeFolder.GetFiles("*" + x).Any())))
-                            {
-                                var appCodeAssembly = Assembly.Load("App_Code");
-                                if (!assemblies.Contains(appCodeAssembly)) // BuildManager will find App_Code already
-                                    assemblies.Add(appCodeAssembly);
-                            }
-
-                            //now set the _allAssemblies
-                            _allAssemblies = new ReadOnlyCollection<Assembly>(assemblies);
-
-                        }
-                        catch (InvalidOperationException e)
-                        {
-                            if (!(e.InnerException is SecurityException))
-                                throw;
-
-                            _binFolderAssemblies = _allAssemblies;
-                        }
-                    }
-                }
-
-                return _allAssemblies;
-            }
-
-            /// <summary>
-            /// Returns only assemblies found in the bin folder that have been loaded into the app domain.
-            /// </summary>
-            /// <returns></returns>
-            /// <remarks>
-            /// This will be used if we implement App_Plugins from Umbraco v5 but currently it is not used.
-            /// </remarks>
-            internal static IEnumerable<Assembly> GetBinAssemblies()
-            {
-
-                if (_binFolderAssemblies == null)
-                {
-                    using (new WriteLock(Locker))
-                    {
-                        var assemblies = GetAssembliesWithKnownExclusions().ToArray();
-                        var binFolder = Assembly.GetExecutingAssembly().GetAssemblyFile().Directory;
-                        var binAssemblyFiles = Directory.GetFiles(binFolder.FullName, "*.dll", SearchOption.TopDirectoryOnly).ToList();
-                        var domainAssemblyNames = binAssemblyFiles.Select(AssemblyName.GetAssemblyName);
-                        var safeDomainAssemblies = new List<Assembly>();
-                        var binFolderAssemblies = new List<Assembly>();
-
-                        foreach (var a in assemblies)
-                        {
-                            try
-                            {
-                                //do a test to see if its queryable in med trust
-                                var assemblyFile = a.GetAssemblyFile();
-                                safeDomainAssemblies.Add(a);
-                            }
-                            catch (SecurityException)
-                            {
-                                //we will just ignore this because this will fail
-                                //in medium trust for system assemblies, we get an exception but we just want to continue until we get to
-                                //an assembly that is ok.
-                            }
-                        }
-
-                        foreach (var assemblyName in domainAssemblyNames)
-                        {
-                            try
-                            {
-                                var foundAssembly = safeDomainAssemblies.FirstOrDefault(a => a.GetAssemblyFile() == assemblyName.GetAssemblyFile());
-                                if (foundAssembly != null)
-                                {
-                                    binFolderAssemblies.Add(foundAssembly);
-                                }
-                            }
-                            catch (SecurityException)
-                            {
-                                //we will just ignore this because if we are trying to do a call to:
-                                // AssemblyName.ReferenceMatchesDefinition(a.GetName(), assemblyName)))
-                                //in medium trust for system assemblies, we get an exception but we just want to continue until we get to
-                                //an assembly that is ok.
-                            }
-                        }
-
-                        _binFolderAssemblies = new ReadOnlyCollection<Assembly>(binFolderAssemblies);
-                    }
-                }
-                return _binFolderAssemblies;
-            }
-
-            /// <summary>
-            /// Return a list of found local Assemblies excluding the known assemblies we don't want to scan
-            /// and exluding the ones passed in and excluding the exclusion list filter, the results of this are
-            /// cached for perforance reasons.
-            /// </summary>
-            /// <param name="excludeFromResults"></param>
-            /// <returns></returns>
-            internal static IEnumerable<Assembly> GetAssembliesWithKnownExclusions(
-                IEnumerable<Assembly> excludeFromResults = null)
-            {
-                if (LocalFilteredAssemblyCache.Any()) return LocalFilteredAssemblyCache;
-                using (new WriteLock(LocalFilteredAssemblyCacheLocker))
-                {
-                    var assemblies = GetFilteredAssemblies(excludeFromResults, KnownAssemblyExclusionFilter);
-                    foreach (var assembly in assemblies) LocalFilteredAssemblyCache.Add(assembly);
-                }
-                return LocalFilteredAssemblyCache;
-            }
-
-            /// <summary>
-            /// Return a list of found local Assemblies and exluding the ones passed in and excluding the exclusion list filter
-            /// </summary>
-            /// <param name="excludeFromResults"></param>
-            /// <param name="exclusionFilter"></param>
-            /// <returns></returns>
-            private static IEnumerable<Assembly> GetFilteredAssemblies(
-                IEnumerable<Assembly> excludeFromResults = null,
-                string[] exclusionFilter = null)
-            {
-                if (excludeFromResults == null)
-                    excludeFromResults = new List<Assembly>();
-                if (exclusionFilter == null)
-                    exclusionFilter = new string[] { };
-
-                return GetAllAssemblies()
-                    .Where(x => !excludeFromResults.Contains(x)
-                                && !x.GlobalAssemblyCache
-                                && !exclusionFilter.Any(f => x.FullName.StartsWith(f)));
-            }
-
-            /// <summary>
-            /// this is our assembly filter to filter out known types that def dont contain types we'd like to find or plugins
-            /// </summary>
-            /// <remarks>
-            /// NOTE the comma vs period... comma delimits the name in an Assembly FullName property so if it ends with comma then its an exact name match
-            /// </remarks>
-            internal static readonly string[] KnownAssemblyExclusionFilter = new[]
-                {
-                    "mscorlib,",
-                    "System.",
-                    "Antlr3.",
-                    "Autofac.",
-                    "Autofac,",
-                    "Castle.",
-                    "ClientDependency.",
-                    "DataAnnotationsExtensions.",
-                    "DataAnnotationsExtensions,",
-                    "Dynamic,",
-                    "HtmlDiff,",
-                    "Iesi.Collections,",
-                    "Microsoft.",
-                    "Newtonsoft.",
-                    "NHibernate.",
-                    "NHibernate,",
-                    "NuGet.",
-                    "RouteDebugger,",
-                    "SqlCE4Umbraco,",
-                    "umbraco.datalayer,",
-                    "umbraco.interfaces,",
-                    "umbraco.providers,",
-                    "Umbraco.Web.UI,",
-                    "Lucene.",
-                    "Examine,",
-                    "Examine.",
-                    "ServiceStack.",
-                    "MySql.",
-                    "HtmlAgilityPack.",
-                    "TidyNet.",
-                    "ICSharpCode.",
-                    "CookComputing.",
-                    /* Mono */
-                    "MonoDevelop.NUnit",
-                    "Serilog."
-                };
-
-            public static IEnumerable<Type> FindClassesOfTypeWithAttribute<T, TAttribute>()
-                where TAttribute : Attribute
-            {
-                return FindClassesOfTypeWithAttribute<T, TAttribute>(GetAssembliesWithKnownExclusions(), true);
-            }
-
-            public static IEnumerable<Type> FindClassesOfTypeWithAttribute<T, TAttribute>(IEnumerable<Assembly> assemblies)
-                where TAttribute : Attribute
-            {
-                return FindClassesOfTypeWithAttribute<T, TAttribute>(assemblies, true);
-            }
-
-            public static IEnumerable<Type> FindClassesOfTypeWithAttribute<T, TAttribute>(IEnumerable<Assembly> assemblies, bool onlyConcreteClasses)
-                where TAttribute : Attribute
-            {
-                if (assemblies == null) throw new ArgumentNullException("assemblies");
-
-                var l = new List<Type>();
-                foreach (var a in assemblies)
-                {
-                    var types = from t in GetTypesWithFormattedException(a)
-                                where !t.IsInterface
-                                      && typeof(T).IsAssignableFrom(t)
-                                      && t.GetCustomAttributes<TAttribute>(false).Any()
-                                      && (!onlyConcreteClasses || (t.IsClass && !t.IsAbstract))
-                                select t;
-                    l.AddRange(types);
-                }
-
-                return l;
-            }
-
-            /// <summary>
-            /// Searches all filtered local assemblies specified for classes of the type passed in.
-            /// </summary>
-            /// <typeparam name="T"></typeparam>
-            /// <returns></returns>
-            public static IEnumerable<Type> FindClassesOfType<T>()
-            {
-                return FindClassesOfType<T>(GetAssembliesWithKnownExclusions(), true);
-            }
-
-            /// <summary>
-            /// Returns all types found of in the assemblies specified of type T
-            /// </summary>
-            /// <typeparam name="T"></typeparam>
-            /// <param name="assemblies"></param>
-            /// <param name="onlyConcreteClasses"></param>
-            /// <returns></returns>
-            public static IEnumerable<Type> FindClassesOfType<T>(IEnumerable<Assembly> assemblies, bool onlyConcreteClasses)
-            {
-                if (assemblies == null) throw new ArgumentNullException("assemblies");
-
-                return GetAssignablesFromType<T>(assemblies, onlyConcreteClasses);
-            }
-
-            /// <summary>
-            /// Returns all types found of in the assemblies specified of type T
-            /// </summary>
-            /// <typeparam name="T"></typeparam>
-            /// <param name="assemblies"></param>
-            /// <returns></returns>
-            public static IEnumerable<Type> FindClassesOfType<T>(IEnumerable<Assembly> assemblies)
-            {
-                return FindClassesOfType<T>(assemblies, true);
-            }
-
-            /// <summary>
-            /// Finds the classes with attribute.
-            /// </summary>
-            /// <typeparam name="T"></typeparam>
-            /// <param name="assemblies">The assemblies.</param>
-            /// <param name="onlyConcreteClasses">if set to <c>true</c> only concrete classes.</param>
-            /// <returns></returns>
-            public static IEnumerable<Type> FindClassesWithAttribute<T>(IEnumerable<Assembly> assemblies, bool onlyConcreteClasses)
-                where T : Attribute
-            {
-                return FindClassesWithAttribute(typeof(T), assemblies, onlyConcreteClasses);
-            }
-
-            /// <summary>
-            /// Finds the classes with attribute.
-            /// </summary>
-            /// <param name="type">The attribute type </param>
-            /// <param name="assemblies">The assemblies.</param>
-            /// <param name="onlyConcreteClasses">if set to <c>true</c> only concrete classes.</param>
-            /// <returns></returns>
-            public static IEnumerable<Type> FindClassesWithAttribute(Type type, IEnumerable<Assembly> assemblies, bool onlyConcreteClasses)
-            {
-                if (assemblies == null) throw new ArgumentNullException("assemblies");
-                if (!TypeHelper.IsTypeAssignableFrom<Attribute>(type))
-                    throw new ArgumentException("The type specified: " + type + " is not an Attribute type");
-
-                var l = new List<Type>();
-                foreach (var a in assemblies)
-                {
-                    var types = from t in GetTypesWithFormattedException(a)
-                                where !t.IsInterface && t.GetCustomAttributes(type, false).Any() && (!onlyConcreteClasses || (t.IsClass && !t.IsAbstract))
-                                select t;
-                    l.AddRange(types);
-                }
-
-                return l;
-            }
-
-            /// <summary>
-            /// Finds the classes with attribute.
-            /// </summary>
-            /// <typeparam name="T"></typeparam>
-            /// <param name="assemblies">The assemblies.</param>
-            /// <returns></returns>
-            public static IEnumerable<Type> FindClassesWithAttribute<T>(IEnumerable<Assembly> assemblies)
-                where T : Attribute
-            {
-                return FindClassesWithAttribute<T>(assemblies, true);
-            }
-
-            /// <summary>
-            /// Finds the classes with attribute in filtered local assemblies
-            /// </summary>
-            /// <typeparam name="T"></typeparam>
-            /// <returns></returns>
-            public static IEnumerable<Type> FindClassesWithAttribute<T>()
-                where T : Attribute
-            {
-                return FindClassesWithAttribute<T>(GetAssembliesWithKnownExclusions());
-            }
-
-
-            #region Private methods
-
-            /// <summary>
-            /// Gets a collection of assignables of type T from a collection of assemblies
-            /// </summary>
-            /// <typeparam name="T"></typeparam>
-            /// <param name="assemblies"></param>
-            /// <param name="onlyConcreteClasses"></param>
-            /// <returns></returns>
-            private static IEnumerable<Type> GetAssignablesFromType<T>(IEnumerable<Assembly> assemblies, bool onlyConcreteClasses)
-            {
-                return GetTypes(typeof(T), assemblies, onlyConcreteClasses);
-            }
-
-            private static IEnumerable<Type> GetTypes(Type assignTypeFrom, IEnumerable<Assembly> assemblies, bool onlyConcreteClasses)
-            {
-                var l = new List<Type>();
-                foreach (var a in assemblies)
-                {
-                    var types = from t in GetTypesWithFormattedException(a)
-                                where !t.IsInterface && assignTypeFrom.IsAssignableFrom(t) && (!onlyConcreteClasses || (t.IsClass && !t.IsAbstract))
-                                select t;
-                    l.AddRange(types);
-                }
-                return l;
-            }
-
-            private static IEnumerable<Type> GetTypesWithFormattedException(Assembly a)
-            {
-                //if the assembly is dynamic, do not try to scan it
-                if (a.IsDynamic)
-                    return Enumerable.Empty<Type>();
-
-                try
-                {
-                    return a.GetExportedTypes();
-                }
-                catch (ReflectionTypeLoadException ex)
-                {
-                    var sb = new StringBuilder();
-                    sb.AppendLine("Could not load types from assembly " + a.FullName + ", errors:");
-                    foreach (var loaderException in ex.LoaderExceptions.WhereNotNull())
-                    {
-                        sb.AppendLine("Exception: " + loaderException.ToString());
-                    }
-                    throw new ReflectionTypeLoadException(ex.Types, ex.LoaderExceptions, sb.ToString());
-                }
-            }
-
-            #endregion
-
-
-
-        }
     }
 
 
diff --git a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
index d22b534d2b..5163e6a4e8 100644
--- a/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
+++ b/src/Umbraco.Tests/Composing/TypeLoaderTests.cs
@@ -27,24 +27,30 @@ namespace Umbraco.Tests.Composing
         public void Initialize()
         {
             // this ensures it's reset
-            _typeLoader = new TypeLoader(NoAppCache.Instance, Current.IOHelper.MapPath("~/App_Data/TEMP"), new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()), false);
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            _typeLoader = new TypeLoader(IOHelper.Default, typeFinder, NoAppCache.Instance,
+                new DirectoryInfo(IOHelper.Default.MapPath("~/App_Data/TEMP")),
+                new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()), false,
+
+                // for testing, we'll specify which assemblies are scanned for the PluginTypeResolver
+                // TODO: Should probably update this so it only searches this assembly and add custom types to be found
+                new[]
+                {
+                    this.GetType().Assembly,
+                    typeof(System.Guid).Assembly,
+                    typeof(NUnit.Framework.Assert).Assembly,
+                    typeof(Microsoft.CSharp.CSharpCodeProvider).Assembly,
+                    typeof(System.Xml.NameTable).Assembly,
+                    typeof(System.Configuration.GenericEnumConverter).Assembly,
+                    typeof(System.Web.SiteMap).Assembly,
+                    //typeof(TabPage).Assembly,
+                    typeof(System.Web.Mvc.ActionResult).Assembly,
+                    typeof(TypeFinder).Assembly,
+                    typeof(UmbracoContext).Assembly
+                });
+
+
 
-            // for testing, we'll specify which assemblies are scanned for the PluginTypeResolver
-            // TODO: Should probably update this so it only searches this assembly and add custom types to be found
-            _typeLoader.AssembliesToScan = new[]
-            {
-                this.GetType().Assembly,
-                typeof(System.Guid).Assembly,
-                typeof(NUnit.Framework.Assert).Assembly,
-                typeof(Microsoft.CSharp.CSharpCodeProvider).Assembly,
-                typeof(System.Xml.NameTable).Assembly,
-                typeof(System.Configuration.GenericEnumConverter).Assembly,
-                typeof(System.Web.SiteMap).Assembly,
-                //typeof(TabPage).Assembly,
-                typeof(System.Web.Mvc.ActionResult).Assembly,
-                typeof(TypeFinder).Assembly,
-                typeof(UmbracoContext).Assembly
-            };
         }
 
         [TearDown]
@@ -189,15 +195,15 @@ AnotherContentFinder
         [Test]
         public void Create_Cached_Plugin_File()
         {
-            var types = new[] { typeof (TypeLoader), typeof (TypeLoaderTests), typeof (UmbracoContext) };
+            var types = new[] { typeof(TypeLoader), typeof(TypeLoaderTests), typeof(UmbracoContext) };
 
-            var typeList1 = new TypeLoader.TypeList(typeof (object), null);
+            var typeList1 = new TypeLoader.TypeList(typeof(object), null);
             foreach (var type in types) typeList1.Add(type);
             _typeLoader.AddTypeList(typeList1);
             _typeLoader.WriteCache();
 
-            var plugins = _typeLoader.TryGetCached(typeof (object), null);
-            var diffType = _typeLoader.TryGetCached(typeof (object), typeof (ObsoleteAttribute));
+            var plugins = _typeLoader.TryGetCached(typeof(object), null);
+            var diffType = _typeLoader.TryGetCached(typeof(object), typeof(ObsoleteAttribute));
 
             Assert.IsTrue(plugins.Success);
             //this will be false since there is no cache of that type resolution kind
@@ -268,7 +274,7 @@ AnotherContentFinder
         public void GetDataEditors()
         {
             var types = _typeLoader.GetDataEditors();
-            Assert.AreEqual(38, types.Count());
+            Assert.AreEqual(37, types.Count());
         }
 
         /// <summary>
@@ -280,16 +286,16 @@ AnotherContentFinder
         {
             var types = new HashSet<TypeLoader.TypeList>();
 
-            var propEditors = new TypeLoader.TypeList(typeof (DataEditor), null);
+            var propEditors = new TypeLoader.TypeList(typeof(DataEditor), null);
             propEditors.Add(typeof(LabelPropertyEditor));
             types.Add(propEditors);
 
-            var found = types.SingleOrDefault(x => x.BaseType == typeof (DataEditor) && x.AttributeType == null);
+            var found = types.SingleOrDefault(x => x.BaseType == typeof(DataEditor) && x.AttributeType == null);
 
             Assert.IsNotNull(found);
 
             //This should not find a type list of this type
-            var shouldNotFind = types.SingleOrDefault(x => x.BaseType == typeof (IDataEditor) && x.AttributeType == null);
+            var shouldNotFind = types.SingleOrDefault(x => x.BaseType == typeof(IDataEditor) && x.AttributeType == null);
 
             Assert.IsNull(shouldNotFind);
         }
diff --git a/src/Umbraco.Tests/CoreThings/ObjectExtensionsTests.cs b/src/Umbraco.Tests/CoreThings/ObjectExtensionsTests.cs
index 486d35540c..544c6335e1 100644
--- a/src/Umbraco.Tests/CoreThings/ObjectExtensionsTests.cs
+++ b/src/Umbraco.Tests/CoreThings/ObjectExtensionsTests.cs
@@ -7,6 +7,7 @@ using System.Web.UI.WebControls;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.CoreThings
 {
@@ -300,10 +301,7 @@ namespace Umbraco.Tests.CoreThings
         [Test]
         public void Value_Editor_Can_Convert_Decimal_To_Decimal_Clr_Type()
         {
-            var valueEditor = new DataValueEditor
-            {
-                ValueType = ValueTypes.Decimal
-            };
+            var valueEditor = TestHelper.CreateDataValueEditor(ValueTypes.Decimal);
 
             var result = valueEditor.TryConvertValueToCrlType(12.34d);
             Assert.IsTrue(result.Success);
diff --git a/src/Umbraco.Tests/CoreThings/UdiTests.cs b/src/Umbraco.Tests/CoreThings/UdiTests.cs
index 8dc5f15fef..dc2265eac2 100644
--- a/src/Umbraco.Tests/CoreThings/UdiTests.cs
+++ b/src/Umbraco.Tests/CoreThings/UdiTests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using Moq;
@@ -25,11 +26,11 @@ namespace Umbraco.Tests.CoreThings
         {
             // FIXME: bad in a unit test - but Udi has a static ctor that wants it?!
             var container = new Mock<IFactory>();
-            var globalSettings = SettingsForTests.GenerateMockGlobalSettings();
+            var ioHelper = IOHelper.Default;
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
             container.Setup(x => x.GetInstance(typeof(TypeLoader))).Returns(
-                new TypeLoader(NoAppCache.Instance, Current.IOHelper.MapPath("~/App_Data/TEMP"), new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>())));
+                new TypeLoader(ioHelper, typeFinder, NoAppCache.Instance, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>())));
             Current.Factory = container.Object;
-            CurrentCore.Factory = container.Object;
 
             Udi.ResetUdiTypes();
         }
diff --git a/src/Umbraco.Tests/IO/FileSystemsTests.cs b/src/Umbraco.Tests/IO/FileSystemsTests.cs
index d1201ee329..2df90b8234 100644
--- a/src/Umbraco.Tests/IO/FileSystemsTests.cs
+++ b/src/Umbraco.Tests/IO/FileSystemsTests.cs
@@ -13,7 +13,6 @@ using Umbraco.Core.Services;
 using Umbraco.Tests.Components;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Core.Composing.CompositionExtensions;
-using Umbraco.Core.Configuration;
 using FileSystems = Umbraco.Core.IO.FileSystems;
 
 namespace Umbraco.Tests.IO
@@ -29,7 +28,7 @@ namespace Umbraco.Tests.IO
         {
             _register = RegisterFactory.Create();
 
-            var composition = new Composition(_register, new TypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), new ConfigsFactory().Create());
+            var composition = new Composition(_register, TestHelper.GetMockedTypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), TestHelper.GetConfigs());
 
             composition.Register(_ => Mock.Of<ILogger>());
             composition.Register(_ => Mock.Of<IDataTypeService>());
@@ -47,7 +46,6 @@ namespace Umbraco.Tests.IO
 
             Current.Reset();
             Current.Factory = _factory;
-            CurrentCore.Factory = _factory;
 
             // make sure we start clean
             // because some tests will create corrupt or weird filesystems
diff --git a/src/Umbraco.Tests/Macros/MacroTests.cs b/src/Umbraco.Tests/Macros/MacroTests.cs
index e813424ad6..f15795e299 100644
--- a/src/Umbraco.Tests/Macros/MacroTests.cs
+++ b/src/Umbraco.Tests/Macros/MacroTests.cs
@@ -1,8 +1,10 @@
-using NUnit.Framework;
+using Moq;
+using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Web.Macros;
@@ -16,11 +18,12 @@ namespace Umbraco.Tests.Macros
         [SetUp]
         public void Setup()
         {
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
             //we DO want cache enabled for these tests
             var cacheHelper = new AppCaches(
-                new ObjectCacheAppCache(),
+                new ObjectCacheAppCache(typeFinder),
                 NoAppCache.Instance,
-                new IsolatedCaches(type => new ObjectCacheAppCache()));
+                new IsolatedCaches(type => new ObjectCacheAppCache(typeFinder)));
             //Current.ApplicationContext = new ApplicationContext(cacheHelper, new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
 
             Current.Reset();
diff --git a/src/Umbraco.Tests/Manifest/ManifestContentAppTests.cs b/src/Umbraco.Tests/Manifest/ManifestContentAppTests.cs
index 1e02f562e3..c949e0bb67 100644
--- a/src/Umbraco.Tests/Manifest/ManifestContentAppTests.cs
+++ b/src/Umbraco.Tests/Manifest/ManifestContentAppTests.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
+using Umbraco.Web.Composing;
 
 namespace Umbraco.Tests.Manifest
 {
@@ -67,7 +68,7 @@ namespace Umbraco.Tests.Manifest
         private void AssertDefinition(object source, bool expected, string[] show, IReadOnlyUserGroup[] groups)
         {
             var definition = JsonConvert.DeserializeObject<ManifestContentAppDefinition>("{" + (show.Length == 0 ? "" : " \"show\": [" + string.Join(",", show.Select(x => "\"" + x + "\"")) + "] ") + "}");
-            var factory = new ManifestContentAppFactory(definition);
+            var factory = new ManifestContentAppFactory(definition, Current.IOHelper);
             var app = factory.GetContentAppFor(source, groups);
             if (expected)
                 Assert.IsNotNull(app);
diff --git a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
index bf4ee433ee..936138155e 100644
--- a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
+++ b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
@@ -13,23 +13,21 @@ using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.PropertyEditors.Validators;
 using Umbraco.Core.Services;
 using Umbraco.Core.Dashboards;
-using Umbraco.Core.IO;
+using Umbraco.Core.Serialization;
 
 namespace Umbraco.Tests.Manifest
 {
     [TestFixture]
     public class ManifestParserTests
     {
-        private IManifestParser _parser;
+        private ManifestParser _parser;
 
         [SetUp]
         public void Setup()
         {
             Current.Reset();
-            CurrentCore.Reset();
             var factory = Mock.Of<IFactory>();
             Current.Factory = factory;
-            CurrentCore.Factory = factory;
 
             var serviceContext = ServiceContext.CreatePartial(
                 localizedTextService: Mock.Of<ILocalizedTextService>());
@@ -47,7 +45,7 @@ namespace Umbraco.Tests.Manifest
                 new RequiredValidator(Mock.Of<ILocalizedTextService>()),
                 new RegexValidator(Mock.Of<ILocalizedTextService>(), null)
             };
-            _parser = new ManifestParser(AppCaches.Disabled, new ManifestValueValidatorCollection(validators), new ManifestFilterCollection(Array.Empty<IManifestFilter>()),  Mock.Of<ILogger>(), Mock.Of<IIOHelper>());
+            _parser = new ManifestParser(AppCaches.Disabled, new ManifestValueValidatorCollection(validators), new ManifestFilterCollection(Array.Empty<IManifestFilter>()),  Mock.Of<ILogger>(), Current.IOHelper, Mock.Of<IDataTypeService>(), Mock.Of<ILocalizationService>(), new JsonNetSerializer());
         }
 
         [Test]
diff --git a/src/Umbraco.Tests/Mapping/MappingTests.cs b/src/Umbraco.Tests/Mapping/MappingTests.cs
index e6a382692c..ad336168c6 100644
--- a/src/Umbraco.Tests/Mapping/MappingTests.cs
+++ b/src/Umbraco.Tests/Mapping/MappingTests.cs
@@ -285,10 +285,10 @@ namespace Umbraco.Tests.Mapping
         {
             public void DefineMaps(UmbracoMapper mapper)
             {
-                mapper.Define<Property, ContentPropertyDto>((source, context) => new ContentPropertyDto(), Map);
+                mapper.Define<IProperty, ContentPropertyDto>((source, context) => new ContentPropertyDto(), Map);
             }
 
-            private static void Map(Property source, ContentPropertyDto target, MapperContext context)
+            private static void Map(IProperty source, ContentPropertyDto target, MapperContext context)
             { }
         }
 
diff --git a/src/Umbraco.Tests/Models/ContentExtensionsTests.cs b/src/Umbraco.Tests/Models/ContentExtensionsTests.cs
index 42d7f0e01b..52cf5ddef5 100644
--- a/src/Umbraco.Tests/Models/ContentExtensionsTests.cs
+++ b/src/Umbraco.Tests/Models/ContentExtensionsTests.cs
@@ -32,7 +32,7 @@ namespace Umbraco.Tests.Models
             Composition.Register(_ => Mock.Of<IContentSection>());
 
             // all this is required so we can validate properties...
-            var editor = new TextboxPropertyEditor(Mock.Of<ILogger>()) { Alias = "test" };
+            var editor = new TextboxPropertyEditor(Mock.Of<ILogger>(), Mock.Of<IDataTypeService>(), Mock.Of<ILocalizationService>()) { Alias = "test" };
             Composition.Register(_ => new DataEditorCollection(new[] { editor }));
             Composition.Register<PropertyEditorCollection>();
             var dataType = Mock.Of<IDataType>();
diff --git a/src/Umbraco.Tests/Models/ContentTests.cs b/src/Umbraco.Tests/Models/ContentTests.cs
index b7aca9df66..bdb1a193bc 100644
--- a/src/Umbraco.Tests/Models/ContentTests.cs
+++ b/src/Umbraco.Tests/Models/ContentTests.cs
@@ -9,6 +9,7 @@ using Newtonsoft.Json;
 using Umbraco.Core;
 using NUnit.Framework;
 using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Composing.CompositionExtensions;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
@@ -42,7 +43,7 @@ namespace Umbraco.Tests.Models
             Composition.Register(_ => Mock.Of<IContentSection>());
 
             // all this is required so we can validate properties...
-            var editor = new TextboxPropertyEditor(Mock.Of<ILogger>()) { Alias = "test" };
+            var editor = new TextboxPropertyEditor(Mock.Of<ILogger>(), Mock.Of<IDataTypeService>(), Mock.Of<ILocalizationService>()) { Alias = "test" };
             Composition.Register(_ => new DataEditorCollection(new [] { editor }));
             Composition.Register<PropertyEditorCollection>();
             var dataType = Mock.Of<IDataType>();
@@ -269,7 +270,7 @@ namespace Umbraco.Tests.Models
             content.UpdateDate = DateTime.Now;
             content.WriterId = 23;
 
-            var runtimeCache = new ObjectCacheAppCache();
+            var runtimeCache = new ObjectCacheAppCache(new TypeFinder(Mock.Of<ILogger>()));
             runtimeCache.Insert(content.Id.ToString(CultureInfo.InvariantCulture), () => content);
 
             var proflog = GetTestProfilingLogger();
diff --git a/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs b/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs
index 21180ce51b..968e51ab97 100644
--- a/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs
+++ b/src/Umbraco.Tests/Models/Mapping/ContentTypeModelMappingTests.cs
@@ -24,6 +24,7 @@ namespace Umbraco.Tests.Models.Mapping
         private readonly Mock<IDataTypeService> _dataTypeService = new Mock<IDataTypeService>();
         private readonly Mock<IEntityService> _entityService = new Mock<IEntityService>();
         private readonly Mock<IFileService> _fileService = new Mock<IFileService>();
+        private readonly Mock<ILocalizationService> _localizationService = new Mock<ILocalizationService>();
         private Mock<PropertyEditorCollection> _editorsMock;
 
         protected override void Compose()
@@ -31,7 +32,7 @@ namespace Umbraco.Tests.Models.Mapping
             base.Compose();
 
             // create and register a fake property editor collection to return fake property editors
-            var editors = new DataEditor[] { new TextboxPropertyEditor(Mock.Of<ILogger>()), };
+            var editors = new DataEditor[] { new TextboxPropertyEditor(Mock.Of<ILogger>(), _dataTypeService.Object, _localizationService.Object), };
             var dataEditors = new DataEditorCollection(editors);
             _editorsMock = new Mock<PropertyEditorCollection>(dataEditors);
             _editorsMock.Setup(x => x[It.IsAny<string>()]).Returns(editors[0]);
diff --git a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
index 6a4054d5ae..9a47ad1b4a 100644
--- a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
+++ b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
@@ -40,7 +40,7 @@ namespace Umbraco.Tests.Models.Mapping
             Composition.Register(_ => Mock.Of<IContentSection>());
 
             // all this is required so we can validate properties...
-            var editor = new TextboxPropertyEditor(Mock.Of<ILogger>()) { Alias = "test" };
+            var editor = new TextboxPropertyEditor(Mock.Of<ILogger>(), Mock.Of<IDataTypeService>(), Mock.Of<ILocalizationService>()) { Alias = "test" };
             Composition.Register(_ => new DataEditorCollection(new[] { editor }));
             Composition.Register<PropertyEditorCollection>();
             var dataType = Mock.Of<IDataType>();
@@ -261,7 +261,7 @@ namespace Umbraco.Tests.Models.Mapping
 
         #region Assertions
 
-        private void AssertDisplayProperty<T>(IContentProperties<T> result, Property p)
+        private void AssertDisplayProperty<T>(IContentProperties<T> result, IProperty p)
             where T : ContentPropertyBasic
         {
             var pDto = result.Properties.SingleOrDefault(x => x.Alias == p.Alias);
@@ -325,7 +325,7 @@ namespace Umbraco.Tests.Models.Mapping
             Assert.AreEqual(content.Properties.Count(), result.Properties.Count(x => x.Alias.StartsWith("_umb_") == false));
         }
 
-        private void AssertBasicProperty<T>(IContentProperties<T> result, Property p)
+        private void AssertBasicProperty<T>(IContentProperties<T> result, IProperty p)
             where T : ContentPropertyBasic
         {
             var pDto = result.Properties.SingleOrDefault(x => x.Alias == p.Alias);
@@ -341,7 +341,7 @@ namespace Umbraco.Tests.Models.Mapping
                 Assert.AreEqual(pDto.Value, p.GetValue().ToString());
         }
 
-        private void AssertProperty(IContentProperties<ContentPropertyDto> result, Property p)
+        private void AssertProperty(IContentProperties<ContentPropertyDto> result, IProperty p)
         {
             AssertBasicProperty(result, p);
 
diff --git a/src/Umbraco.Tests/Models/MediaXmlTest.cs b/src/Umbraco.Tests/Models/MediaXmlTest.cs
index 3ae9414dc1..4b4b333e74 100644
--- a/src/Umbraco.Tests/Models/MediaXmlTest.cs
+++ b/src/Umbraco.Tests/Models/MediaXmlTest.cs
@@ -33,9 +33,11 @@ namespace Umbraco.Tests.Models
             var logger = Mock.Of<ILogger>();
             var scheme = Mock.Of<IMediaPathScheme>();
             var config = Mock.Of<IContentSection>();
+            var dataTypeService = Mock.Of<IDataTypeService>();
+            var localizationService = Mock.Of<ILocalizationService>();
 
             var mediaFileSystem = new MediaFileSystem(Mock.Of<IFileSystem>(), config, scheme, logger);
-            var ignored = new FileUploadPropertyEditor(Mock.Of<ILogger>(), mediaFileSystem, config);
+            var ignored = new FileUploadPropertyEditor(Mock.Of<ILogger>(), mediaFileSystem, config, dataTypeService, localizationService);
 
             var media = MockedMedia.CreateMediaImage(mediaType, -1);
             media.WriterId = -1; // else it's zero and that's not a user and it breaks the tests
diff --git a/src/Umbraco.Tests/Models/PropertyTypeTests.cs b/src/Umbraco.Tests/Models/PropertyTypeTests.cs
index 1bc99162af..b4d14e7bb5 100644
--- a/src/Umbraco.Tests/Models/PropertyTypeTests.cs
+++ b/src/Umbraco.Tests/Models/PropertyTypeTests.cs
@@ -54,7 +54,15 @@ namespace Umbraco.Tests.Models
             var allProps = clone.GetType().GetProperties();
             foreach (var propertyInfo in allProps)
             {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(pt, null));
+                var expected = propertyInfo.GetValue(pt, null);
+                var actual = propertyInfo.GetValue(clone, null);
+                if (propertyInfo.PropertyType == typeof(Lazy<int>))
+                {
+                    expected = ((Lazy<int>) expected).Value;
+                    actual = ((Lazy<int>) actual).Value;
+                }
+
+                Assert.AreEqual(expected, actual, $"Value of propery: '{propertyInfo.Name}': {expected} != {actual}");
             }
         }
 
diff --git a/src/Umbraco.Tests/Models/VariationTests.cs b/src/Umbraco.Tests/Models/VariationTests.cs
index ef788bcdbe..32ff48ab12 100644
--- a/src/Umbraco.Tests/Models/VariationTests.cs
+++ b/src/Umbraco.Tests/Models/VariationTests.cs
@@ -8,6 +8,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
+using Umbraco.Core.Services.Implement;
 using Umbraco.Tests.TestHelpers;
 
 namespace Umbraco.Tests.Models
@@ -34,11 +35,13 @@ namespace Umbraco.Tests.Models
 
             var factory = Mock.Of<IFactory>();
             Current.Factory = factory;
-            CurrentCore.Factory = factory;
+
+            var dataTypeService = Mock.Of<IDataTypeService>();
+            var localizationService = Mock.Of<ILocalizationService>();
 
             var dataEditors = new DataEditorCollection(new IDataEditor[]
             {
-                new DataEditor(Mock.Of<ILogger>()) { Alias = "editor", ExplicitValueEditor = new DataValueEditor("view") }
+                new DataEditor(Mock.Of<ILogger>()) { Alias = "editor", ExplicitValueEditor = TestHelper.CreateDataValueEditor("view") }
             });
             var propertyEditors = new PropertyEditorCollection(dataEditors);
 
@@ -47,7 +50,6 @@ namespace Umbraco.Tests.Models
                 .Setup(x => x.Configuration)
                 .Returns(null);
 
-            var dataTypeService = Mock.Of<IDataTypeService>();
             Mock.Get(dataTypeService)
                 .Setup(x => x.GetDataType(It.IsAny<int>()))
                 .Returns<int>(x => dataType);
diff --git a/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
index 4d62ec8301..af27d47f97 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/DocumentRepositoryTest.cs
@@ -77,9 +77,9 @@ namespace Umbraco.Tests.Persistence.Repositories
         public void CacheActiveForIntsAndGuids()
         {
             var realCache = new AppCaches(
-                new ObjectCacheAppCache(),
+                new ObjectCacheAppCache(TypeFinder),
                 new DictionaryAppCache(),
-                new IsolatedCaches(t => new ObjectCacheAppCache()));
+                new IsolatedCaches(t => new ObjectCacheAppCache(TypeFinder)));
 
             var provider = TestObjects.GetScopeProvider(Logger);
             using (var scope = provider.CreateScope())
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
index d04382e32e..fa916b554d 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
@@ -49,9 +49,9 @@ namespace Umbraco.Tests.Persistence.Repositories
             MediaTypeRepository mediaTypeRepository;
 
             var realCache = new AppCaches(
-                new ObjectCacheAppCache(),
+                new ObjectCacheAppCache(TypeFinder),
                 new DictionaryAppCache(),
-                new IsolatedCaches(t => new ObjectCacheAppCache()));
+                new IsolatedCaches(t => new ObjectCacheAppCache(TypeFinder)));
 
             var provider = TestObjects.GetScopeProvider(Logger);
             using (var scope = provider.CreateScope())
diff --git a/src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs
index 36c1bbdfb4..ae0c71a5b3 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/ScriptRepositoryTest.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Tests.TestHelpers;
@@ -33,6 +34,11 @@ namespace Umbraco.Tests.Persistence.Repositories
             }
         }
 
+        private IScriptRepository CreateRepository()
+        {
+            return new ScriptRepository(_fileSystems, new IOHelper());
+        }
+
         protected override void Compose()
         {
             base.Compose();
@@ -48,7 +54,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             using (var scope = ScopeProvider.CreateScope())
             {
                 // Act
-                var repository = new ScriptRepository(_fileSystems, Mock.Of<IContentSection>());
+                var repository = CreateRepository();
 
                 // Assert
                 Assert.That(repository, Is.Not.Null);
@@ -62,7 +68,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             var provider = TestObjects.GetScopeProvider(Logger);
             using (var scope = ScopeProvider.CreateScope())
             {
-                var repository = new ScriptRepository(_fileSystems, Mock.Of<IContentSection>());
+                var repository = CreateRepository();
 
                 // Act
                 var script = new Script("test-add-script.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
@@ -81,7 +87,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             var provider = TestObjects.GetScopeProvider(Logger);
             using (var scope = ScopeProvider.CreateScope())
             {
-                var repository = new ScriptRepository(_fileSystems, Mock.Of<IContentSection>());
+                var repository = CreateRepository();
 
                 // Act
                 var script = new Script("test-updated-script.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
@@ -107,7 +113,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             var provider = TestObjects.GetScopeProvider(Logger);
             using (var scope = ScopeProvider.CreateScope())
             {
-                var repository = new ScriptRepository(_fileSystems, Mock.Of<IContentSection>());
+                var repository = CreateRepository();
 
                 // Act
                 var script = repository.Get("test-script.js");
@@ -127,7 +133,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             var provider = TestObjects.GetScopeProvider(Logger);
             using (var scope = ScopeProvider.CreateScope())
             {
-                var repository = new ScriptRepository(_fileSystems, Mock.Of<IContentSection>());
+                var repository = CreateRepository();
 
                 // Act
                 var exists = repository.Get("test-script.js");
@@ -146,7 +152,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             var provider = TestObjects.GetScopeProvider(Logger);
             using (var scope = ScopeProvider.CreateScope())
             {
-                var repository = new ScriptRepository(_fileSystems, Mock.Of<IContentSection>());
+                var repository = CreateRepository();
 
                 var script = new Script("test-script1.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
                 repository.Save(script);
@@ -174,7 +180,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             var provider = TestObjects.GetScopeProvider(Logger);
             using (var scope = ScopeProvider.CreateScope())
             {
-                var repository = new ScriptRepository(_fileSystems, Mock.Of<IContentSection>());
+                var repository = CreateRepository();
 
                 var script = new Script("test-script1.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
                 repository.Save(script);
@@ -202,7 +208,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             var provider = TestObjects.GetScopeProvider(Logger);
             using (var scope = ScopeProvider.CreateScope())
             {
-                var repository = new ScriptRepository(_fileSystems, Mock.Of<IContentSection>());
+                var repository = CreateRepository();
 
                 // Act
                 var exists = repository.Exists("test-script.js");
@@ -221,9 +227,9 @@ namespace Umbraco.Tests.Persistence.Repositories
             var provider = TestObjects.GetScopeProvider(Logger);
             using (var scope = ScopeProvider.CreateScope())
             {
-                var repository = new ScriptRepository(_fileSystems, Mock.Of<IContentSection>());
+                var repository = CreateRepository();
 
-                var script = new Script("test-move-script.js") { Content = content };
+                IScript script = new Script("test-move-script.js") { Content = content };
                 repository.Save(script);
 
 
@@ -254,9 +260,9 @@ namespace Umbraco.Tests.Persistence.Repositories
             var provider = TestObjects.GetScopeProvider(Logger);
             using (var scope = ScopeProvider.CreateScope())
             {
-                var repository = new ScriptRepository(_fileSystems, Mock.Of<IContentSection>());
+                var repository = CreateRepository();
 
-                var script = new Script("test-path-1.js") { Content = "// script" };
+                IScript script = new Script("test-path-1.js") { Content = "// script" };
                 repository.Save(script);
 
                 Assert.IsTrue(_fileSystem.FileExists("test-path-1.js"));
diff --git a/src/Umbraco.Tests/Persistence/Repositories/StylesheetRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/StylesheetRepositoryTest.cs
index 6fae1d4749..2358fb257d 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/StylesheetRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/StylesheetRepositoryTest.cs
@@ -6,6 +6,7 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.Repositories.Implement;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.Testing;
@@ -30,6 +31,11 @@ namespace Umbraco.Tests.Persistence.Repositories
             _fileSystem.AddFile("styles.css", stream);
         }
 
+        private IStylesheetRepository CreateRepository()
+        {
+            return new StylesheetRepository(_fileSystems, new IOHelper());
+        }
+
         [Test]
         public void Can_Instantiate_Repository()
         {
@@ -37,7 +43,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             using (ScopeProvider.CreateScope())
             {
                 // Act
-                var repository = new StylesheetRepository(_fileSystems);
+                var repository = CreateRepository();
 
 
                 // Assert
@@ -51,7 +57,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             using (ScopeProvider.CreateScope())
             {
-                var repository = new StylesheetRepository(_fileSystems);
+                var repository = CreateRepository();
 
                 // Act
                 var stylesheet = new Stylesheet("test-add.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
@@ -69,7 +75,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             using (ScopeProvider.CreateScope())
             {
-                var repository = new StylesheetRepository(_fileSystems);
+                var repository = CreateRepository();
 
                 // Act
                 var stylesheet = new Stylesheet("test-update.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
@@ -96,10 +102,10 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             using (ScopeProvider.CreateScope())
             {
-                var repository = new StylesheetRepository(_fileSystems);
+                var repository = CreateRepository();
 
                 // Act
-                var stylesheet = new Stylesheet("test-update.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
+                IStylesheet stylesheet = new Stylesheet("test-update.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
                 repository.Save(stylesheet);
 
 
@@ -123,7 +129,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             using (ScopeProvider.CreateScope())
             {
-                var repository = new StylesheetRepository(_fileSystems);
+                var repository = CreateRepository();
 
                 // Act
                 var stylesheet = new Stylesheet("test-update.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
@@ -142,7 +148,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             using (ScopeProvider.CreateScope())
             {
-                var repository = new StylesheetRepository(_fileSystems);
+                var repository = CreateRepository();
 
                 // Act
                 var stylesheet = new Stylesheet("test-delete.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
@@ -163,7 +169,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             using (ScopeProvider.CreateScope())
             {
-                var repository = new StylesheetRepository(_fileSystems);
+                var repository = CreateRepository();
 
                 // Act
                 var stylesheet = repository.Get("styles.css");
@@ -182,7 +188,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             using (ScopeProvider.CreateScope())
             {
-                var repository = new StylesheetRepository(_fileSystems);
+                var repository = CreateRepository();
 
                 var stylesheet = new Stylesheet("styles-v2.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
                 repository.Save(stylesheet);
@@ -205,7 +211,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             using (ScopeProvider.CreateScope())
             {
-                var repository = new StylesheetRepository(_fileSystems);
+                var repository = CreateRepository();
 
                 var stylesheet = new Stylesheet("styles-v2.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
                 repository.Save(stylesheet);
@@ -228,7 +234,7 @@ namespace Umbraco.Tests.Persistence.Repositories
             // Arrange
             using (ScopeProvider.CreateScope())
             {
-                var repository = new StylesheetRepository(_fileSystems);
+                var repository = CreateRepository();
 
                 // Act
                 var exists = repository.Exists("styles.css");
@@ -245,9 +251,9 @@ namespace Umbraco.Tests.Persistence.Repositories
 
             using (ScopeProvider.CreateScope())
             {
-                var repository = new StylesheetRepository(_fileSystems);
+                var repository = CreateRepository();
 
-                var stylesheet = new Stylesheet("test-path-1.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
+                IStylesheet stylesheet = new Stylesheet("test-path-1.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
                 repository.Save(stylesheet);
 
                 Assert.IsTrue(_fileSystem.FileExists("test-path-1.css"));
diff --git a/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs b/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
index 7a7c8ae2ec..6b6e6f7841 100644
--- a/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
+++ b/src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
@@ -70,12 +70,11 @@ namespace Umbraco.Tests.PropertyEditors
             try
             {
                 var container = RegisterFactory.Create();
-                var composition = new Composition(container, new TypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), new ConfigsFactory().Create());
+                var composition = new Composition(container, TestHelper.GetMockedTypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), TestHelper.GetConfigs());
 
                 composition.WithCollectionBuilder<PropertyValueConverterCollectionBuilder>();
 
                 Current.Factory = composition.CreateFactory();
-                CurrentCore.Factory = composition.CreateFactory();
 
                 var logger = Mock.Of<ILogger>();
                 var scheme = Mock.Of<IMediaPathScheme>();
@@ -84,7 +83,7 @@ namespace Umbraco.Tests.PropertyEditors
                 var mediaFileSystem = new MediaFileSystem(Mock.Of<IFileSystem>(), config, scheme, logger);
 
                 var dataTypeService = new TestObjects.TestDataTypeService(
-                    new DataType(new ImageCropperPropertyEditor(Mock.Of<ILogger>(), mediaFileSystem, Mock.Of<IContentSection>(), Mock.Of<IDataTypeService>())) { Id = 1 });
+                    new DataType(new ImageCropperPropertyEditor(Mock.Of<ILogger>(), mediaFileSystem, Mock.Of<IContentSection>(), Mock.Of<IDataTypeService>(), Mock.Of<ILocalizationService>())) { Id = 1 });
 
                 var factory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), new PropertyValueConverterCollection(Array.Empty<IPropertyValueConverter>()), dataTypeService);
 
diff --git a/src/Umbraco.Tests/PropertyEditors/MultiValuePropertyEditorTests.cs b/src/Umbraco.Tests/PropertyEditors/MultiValuePropertyEditorTests.cs
index b7037eb192..5579395b7e 100644
--- a/src/Umbraco.Tests/PropertyEditors/MultiValuePropertyEditorTests.cs
+++ b/src/Umbraco.Tests/PropertyEditors/MultiValuePropertyEditorTests.cs
@@ -25,12 +25,12 @@ namespace Umbraco.Tests.PropertyEditors
     /// to cache. Now we always just deal with strings and we'll keep the tests that show that.
     /// </remarks>
     [TestFixture]
-    public class MultiValuePropertyEditorTests 
+    public class MultiValuePropertyEditorTests
     {
         [Test]
         public void DropDownMultipleValueEditor_Format_Data_For_Cache()
         {
-            var dataType = new DataType(new CheckBoxListPropertyEditor(Mock.Of<ILogger>(), Mock.Of<ILocalizedTextService>()))
+            var dataType = new DataType(new CheckBoxListPropertyEditor(Mock.Of<ILogger>(), Mock.Of<ILocalizedTextService>(), Mock.Of<IDataTypeService>(), Mock.Of<ILocalizationService>()))
             {
                 Configuration = new ValueListConfiguration
                 {
@@ -51,7 +51,7 @@ namespace Umbraco.Tests.PropertyEditors
 
             var valueEditor = dataType.Editor.GetValueEditor();
             ((DataValueEditor) valueEditor).Configuration = dataType.Configuration;
-            var result = valueEditor.ConvertDbToString(prop.PropertyType, prop.GetValue(), dataTypeService);
+            var result = valueEditor.ConvertDbToString(prop.PropertyType, prop.GetValue());
 
             Assert.AreEqual("Value 1,Value 2,Value 3", result);
         }
@@ -59,7 +59,7 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void DropDownValueEditor_Format_Data_For_Cache()
         {
-            var dataType = new DataType(new CheckBoxListPropertyEditor(Mock.Of<ILogger>(), Mock.Of<ILocalizedTextService>()))
+            var dataType = new DataType(new CheckBoxListPropertyEditor(Mock.Of<ILogger>(), Mock.Of<ILocalizedTextService>(), Mock.Of<IDataTypeService>(), Mock.Of<ILocalizationService>()))
             {
                 Configuration = new ValueListConfiguration
                 {
@@ -78,7 +78,7 @@ namespace Umbraco.Tests.PropertyEditors
             var prop = new Property(1, new PropertyType(dataType));
             prop.SetValue("Value 2");
 
-            var result = dataType.Editor.GetValueEditor().ConvertDbToString(prop.PropertyType, prop.GetValue(), dataTypeService);
+            var result = dataType.Editor.GetValueEditor().ConvertDbToString(prop.PropertyType, prop.GetValue());
 
             Assert.AreEqual("Value 2", result);
         }
diff --git a/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs b/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs
index 19549f66fe..a282496a13 100644
--- a/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs
+++ b/src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs
@@ -4,7 +4,6 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
@@ -25,13 +24,12 @@ namespace Umbraco.Tests.PropertyEditors
             Thread.CurrentThread.CurrentUICulture = Thread.CurrentThread.CurrentCulture;
 
             var register = RegisterFactory.Create();
-            var composition = new Composition(register, new TypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), new ConfigsFactory().Create());
+            var composition = new Composition(register, TestHelper.GetMockedTypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), TestHelper.GetConfigs());
 
             register.Register<IShortStringHelper>(_
                 => new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(SettingsForTests.GetDefaultUmbracoSettings())));
 
             Current.Factory = composition.CreateFactory();
-            CurrentCore.Factory = composition.CreateFactory();
         }
 
         [TearDown]
@@ -49,12 +47,9 @@ namespace Umbraco.Tests.PropertyEditors
             var prop = new Property(1, new PropertyType("test", ValueStorageType.Nvarchar));
             prop.SetValue(value);
 
-            var valueEditor = new DataValueEditor
-                {
-                    ValueType = ValueTypes.String
-            };
+            var valueEditor = TestHelper.CreateDataValueEditor(ValueTypes.String);
 
-            var result = valueEditor.ToEditor(prop, new Mock<IDataTypeService>().Object);
+            var result = valueEditor.ToEditor(prop);
             Assert.AreEqual(isOk, !(result is string));
         }
 
@@ -65,10 +60,7 @@ namespace Umbraco.Tests.PropertyEditors
         [TestCase("DATETIME", "", null)] //test empty string for date
         public void Value_Editor_Can_Convert_To_Clr_Type(string valueType, string val, object expected)
         {
-            var valueEditor = new DataValueEditor
-                {
-                    ValueType = valueType
-                };
+            var valueEditor = TestHelper.CreateDataValueEditor(valueType);
 
             var result = valueEditor.TryConvertValueToCrlType(val);
             Assert.IsTrue(result.Success);
@@ -80,10 +72,7 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void Value_Editor_Can_Convert_To_Decimal_Clr_Type()
         {
-            var valueEditor = new DataValueEditor
-            {
-                ValueType = ValueTypes.Decimal
-            };
+            var valueEditor = TestHelper.CreateDataValueEditor(ValueTypes.Decimal);
 
             var result = valueEditor.TryConvertValueToCrlType("12.34");
             Assert.IsTrue(result.Success);
@@ -93,10 +82,7 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void Value_Editor_Can_Convert_To_Decimal_Clr_Type_With_Other_Separator()
         {
-            var valueEditor = new DataValueEditor
-            {
-                ValueType = ValueTypes.Decimal
-            };
+            var valueEditor = TestHelper.CreateDataValueEditor(ValueTypes.Decimal);
 
             var result = valueEditor.TryConvertValueToCrlType("12,34");
             Assert.IsTrue(result.Success);
@@ -106,10 +92,7 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void Value_Editor_Can_Convert_To_Decimal_Clr_Type_With_Empty_String()
         {
-            var valueEditor = new DataValueEditor
-            {
-                ValueType = ValueTypes.Decimal
-            };
+            var valueEditor = TestHelper.CreateDataValueEditor(ValueTypes.Decimal);
 
             var result = valueEditor.TryConvertValueToCrlType(string.Empty);
             Assert.IsTrue(result.Success);
@@ -119,10 +102,7 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void Value_Editor_Can_Convert_To_Date_Clr_Type()
         {
-            var valueEditor = new DataValueEditor
-                {
-                    ValueType = ValueTypes.Date
-            };
+            var valueEditor = TestHelper.CreateDataValueEditor(ValueTypes.Date);
 
             var result = valueEditor.TryConvertValueToCrlType("2010-02-05");
             Assert.IsTrue(result.Success);
@@ -139,12 +119,9 @@ namespace Umbraco.Tests.PropertyEditors
             var prop = new Property(1, new PropertyType("test", ValueStorageType.Nvarchar));
             prop.SetValue(val);
 
-            var valueEditor = new DataValueEditor
-                {
-                    ValueType = valueType
-                };
+            var valueEditor = TestHelper.CreateDataValueEditor(valueType);
 
-            var result = valueEditor.ToEditor(prop, new Mock<IDataTypeService>().Object);
+            var result = valueEditor.ToEditor(prop);
             Assert.AreEqual(expected, result);
         }
 
@@ -152,30 +129,24 @@ namespace Umbraco.Tests.PropertyEditors
         public void Value_Editor_Can_Serialize_Decimal_Value()
         {
             var value = 12.34M;
-            var valueEditor = new DataValueEditor
-                {
-                    ValueType = ValueTypes.Decimal
-            };
+            var valueEditor = TestHelper.CreateDataValueEditor(ValueTypes.Decimal);
 
             var prop = new Property(1, new PropertyType("test", ValueStorageType.Decimal));
             prop.SetValue(value);
 
-            var result = valueEditor.ToEditor(prop, new Mock<IDataTypeService>().Object);
+            var result = valueEditor.ToEditor(prop);
             Assert.AreEqual("12.34", result);
         }
 
         [Test]
         public void Value_Editor_Can_Serialize_Decimal_Value_With_Empty_String()
         {
-            var valueEditor = new DataValueEditor
-                {
-                    ValueType = ValueTypes.Decimal
-            };
+            var valueEditor = TestHelper.CreateDataValueEditor(ValueTypes.Decimal);
 
             var prop = new Property(1, new PropertyType("test", ValueStorageType.Decimal));
             prop.SetValue(string.Empty);
 
-            var result = valueEditor.ToEditor(prop, new Mock<IDataTypeService>().Object);
+            var result = valueEditor.ToEditor(prop);
             Assert.AreEqual(string.Empty, result);
         }
 
@@ -183,15 +154,12 @@ namespace Umbraco.Tests.PropertyEditors
         public void Value_Editor_Can_Serialize_Date_Value()
         {
             var now = DateTime.Now;
-            var valueEditor = new DataValueEditor
-                {
-                    ValueType = ValueTypes.Date
-            };
+            var valueEditor = TestHelper.CreateDataValueEditor(ValueTypes.Date);
 
             var prop = new Property(1, new PropertyType("test", ValueStorageType.Date));
             prop.SetValue(now);
 
-            var result = valueEditor.ToEditor(prop, new Mock<IDataTypeService>().Object);
+            var result = valueEditor.ToEditor(prop);
             Assert.AreEqual(now.ToIsoString(), result);
         }
     }
diff --git a/src/Umbraco.Tests/Published/ConvertersTests.cs b/src/Umbraco.Tests/Published/ConvertersTests.cs
index 061736a884..ad9da0cf65 100644
--- a/src/Umbraco.Tests/Published/ConvertersTests.cs
+++ b/src/Umbraco.Tests/Published/ConvertersTests.cs
@@ -5,7 +5,6 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
@@ -179,7 +178,7 @@ namespace Umbraco.Tests.Published
             Current.Reset();
             var register = RegisterFactory.Create();
 
-            var composition = new Composition(register, new TypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), new ConfigsFactory().Create());
+            var composition = new Composition(register, TestHelper.GetMockedTypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), TestHelper.GetConfigs());
 
             composition.WithCollectionBuilder<PropertyValueConverterCollectionBuilder>()
                 .Append<SimpleConverter3A>()
@@ -193,7 +192,6 @@ namespace Umbraco.Tests.Published
             register.Register(f => factory);
 
             Current.Factory = composition.CreateFactory();
-            CurrentCore.Factory = composition.CreateFactory();
 
             var cacheMock = new Mock<IPublishedContentCache>();
             var cacheContent = new Dictionary<int, IPublishedContent>();
diff --git a/src/Umbraco.Tests/Published/NestedContentTests.cs b/src/Umbraco.Tests/Published/NestedContentTests.cs
index 9385b8955a..4d99aa86d8 100644
--- a/src/Umbraco.Tests/Published/NestedContentTests.cs
+++ b/src/Umbraco.Tests/Published/NestedContentTests.cs
@@ -11,6 +11,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
 using Umbraco.Tests.PublishedContent;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Web;
@@ -31,9 +32,10 @@ namespace Umbraco.Tests.Published
             var logger = Mock.Of<ILogger>();
             var profiler = Mock.Of<IProfiler>();
             var proflog = new ProfilingLogger(logger, profiler);
+            var localizationService = Mock.Of<ILocalizationService>();
 
             PropertyEditorCollection editors = null;
-            var editor = new NestedContentPropertyEditor(logger, new Lazy<PropertyEditorCollection>(() => editors));
+            var editor = new NestedContentPropertyEditor(logger, new Lazy<PropertyEditorCollection>(() => editors), Mock.Of<IDataTypeService>(), localizationService);
             editors = new PropertyEditorCollection(new DataEditorCollection(new DataEditor[] { editor }));
 
             var dataType1 = new DataType(editor)
@@ -64,7 +66,7 @@ namespace Umbraco.Tests.Published
                 }
             };
 
-            var dataType3 = new DataType(new TextboxPropertyEditor(logger))
+            var dataType3 = new DataType(new TextboxPropertyEditor(logger, Mock.Of<IDataTypeService>(), localizationService))
             {
                 Id = 3
             };
diff --git a/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs b/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs
index 9db539d142..fe2b080310 100644
--- a/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs
+++ b/src/Umbraco.Tests/Published/PropertyCacheLevelTests.cs
@@ -4,6 +4,7 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
@@ -124,8 +125,9 @@ namespace Umbraco.Tests.Published
 
             var setType1 = publishedContentTypeFactory.CreateContentType(1000, "set1", CreatePropertyTypes);
 
-            var elementsCache = new FastDictionaryAppCache();
-            var snapshotCache = new FastDictionaryAppCache();
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var elementsCache = new FastDictionaryAppCache(typeFinder);
+            var snapshotCache = new FastDictionaryAppCache(typeFinder);
 
             var publishedSnapshot = new Mock<IPublishedSnapshot>();
             publishedSnapshot.Setup(x => x.SnapshotCache).Returns(snapshotCache);
@@ -144,39 +146,39 @@ namespace Umbraco.Tests.Published
             Assert.AreEqual(1, converter.SourceConverts);
             Assert.AreEqual(1, converter.InterConverts);
 
-            Assert.AreEqual(elementsCount1, elementsCache.Items.Count);
-            Assert.AreEqual(snapshotCount1, snapshotCache.Items.Count);
+            Assert.AreEqual(elementsCount1, elementsCache.Count);
+            Assert.AreEqual(snapshotCount1, snapshotCache.Count);
 
             Assert.AreEqual(1234, set1.Value("prop1"));
             Assert.AreEqual(1, converter.SourceConverts);
             Assert.AreEqual(interConverts, converter.InterConverts);
 
-            Assert.AreEqual(elementsCount2, elementsCache.Items.Count);
-            Assert.AreEqual(snapshotCount2, snapshotCache.Items.Count);
+            Assert.AreEqual(elementsCount2, elementsCache.Count);
+            Assert.AreEqual(snapshotCount2, snapshotCache.Count);
 
             var oldSnapshotCache = snapshotCache;
-            snapshotCache.Items.Clear();
+            snapshotCache.Clear();
 
             Assert.AreEqual(1234, set1.Value("prop1"));
             Assert.AreEqual(1, converter.SourceConverts);
 
-            Assert.AreEqual(elementsCount2, elementsCache.Items.Count);
-            Assert.AreEqual(snapshotCount2, snapshotCache.Items.Count);
-            Assert.AreEqual(snapshotCount2, oldSnapshotCache.Items.Count);
+            Assert.AreEqual(elementsCount2, elementsCache.Count);
+            Assert.AreEqual(snapshotCount2, snapshotCache.Count);
+            Assert.AreEqual(snapshotCount2, oldSnapshotCache.Count);
 
-            Assert.AreEqual((interConverts == 1 ? 1 : 3) + snapshotCache.Items.Count, converter.InterConverts);
+            Assert.AreEqual((interConverts == 1 ? 1 : 3) + snapshotCache.Count, converter.InterConverts);
 
             var oldElementsCache = elementsCache;
-            elementsCache.Items.Clear();
+            elementsCache.Clear();
 
             Assert.AreEqual(1234, set1.Value("prop1"));
             Assert.AreEqual(1, converter.SourceConverts);
 
-            Assert.AreEqual(elementsCount2, elementsCache.Items.Count);
-            Assert.AreEqual(elementsCount2, oldElementsCache.Items.Count);
-            Assert.AreEqual(snapshotCount2, snapshotCache.Items.Count);
+            Assert.AreEqual(elementsCount2, elementsCache.Count);
+            Assert.AreEqual(elementsCount2, oldElementsCache.Count);
+            Assert.AreEqual(snapshotCount2, snapshotCache.Count);
 
-            Assert.AreEqual((interConverts == 1 ? 1 : 4) + snapshotCache.Items.Count + elementsCache.Items.Count, converter.InterConverts);
+            Assert.AreEqual((interConverts == 1 ? 1 : 4) + snapshotCache.Count + elementsCache.Count, converter.InterConverts);
         }
 
         [Test]
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
index 7dd1241951..7c3bd73692 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
@@ -53,7 +53,6 @@ namespace Umbraco.Tests.PublishedContent
 
             var factory = Mock.Of<IFactory>();
             Current.Factory = factory;
-            CurrentCore.Factory = factory;
 
             var configs = new ConfigsFactory().Create();
             Mock.Get(factory).Setup(x => x.GetInstance(typeof(Configs))).Returns(configs);
@@ -139,6 +138,8 @@ namespace Umbraco.Tests.PublishedContent
             // create a data source for NuCache
             _source = new TestDataSource(kits);
 
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+
             // at last, create the complete NuCache snapshot service!
             var options = new PublishedSnapshotServiceOptions { IgnoreLocalDb = true };
             _snapshotService = new PublishedSnapshotService(options,
@@ -159,7 +160,8 @@ namespace Umbraco.Tests.PublishedContent
                 globalSettings,
                 Mock.Of<IEntityXmlSerializer>(),
                 Mock.Of<IPublishedModelFactory>(),
-                new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider() }));
+                new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider() }),
+                typeFinder);
 
             // invariant is the current default
             _variationAccesor.VariationContext = new VariationContext();
diff --git a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
index 782bb2bfa3..32f5d06e74 100644
--- a/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
@@ -48,7 +48,6 @@ namespace Umbraco.Tests.PublishedContent
 
             var factory = Mock.Of<IFactory>();
             Current.Factory = factory;
-            CurrentCore.Factory = factory;
 
             var configs = new ConfigsFactory().Create();
             Mock.Get(factory).Setup(x => x.GetInstance(typeof(Configs))).Returns(configs);
@@ -182,6 +181,8 @@ namespace Umbraco.Tests.PublishedContent
             // create a variation accessor
             _variationAccesor = new TestVariationContextAccessor();
 
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+
             // at last, create the complete NuCache snapshot service!
             var options = new PublishedSnapshotServiceOptions { IgnoreLocalDb = true };
             _snapshotService = new PublishedSnapshotService(options,
@@ -202,7 +203,8 @@ namespace Umbraco.Tests.PublishedContent
                 globalSettings,
                 Mock.Of<IEntityXmlSerializer>(),
                 Mock.Of<IPublishedModelFactory>(),
-                new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider() }));
+                new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider() }),
+                typeFinder);
 
             // invariant is the current default
             _variationAccesor.VariationContext = new VariationContext();
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs
index 7e6ae75356..d0e780a92b 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentSnapshotTestBase.cs
@@ -1,5 +1,7 @@
 using System;
+using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Web.Routing;
 using Moq;
 using Umbraco.Core;
@@ -12,6 +14,7 @@ using Umbraco.Core.Composing;
 using Current = Umbraco.Core.Composing.Current;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
@@ -41,16 +44,15 @@ namespace Umbraco.Tests.PublishedContent
             Composition.RegisterUnique<IPublishedModelFactory>(f => new PublishedModelFactory(f.GetInstance<TypeLoader>().GetTypes<PublishedContentModel>()));
         }
 
-        protected override TypeLoader CreateTypeLoader(IAppPolicyCache runtimeCache, IGlobalSettings globalSettings, IProfilingLogger logger)
+        protected override TypeLoader CreateTypeLoader(IIOHelper ioHelper, ITypeFinder typeFinder, IAppPolicyCache runtimeCache, IGlobalSettings globalSettings, IProfilingLogger logger)
         {
-            var pluginManager = base.CreateTypeLoader(runtimeCache, globalSettings, logger);
+            var baseLoader = base.CreateTypeLoader(ioHelper, typeFinder, runtimeCache, globalSettings, logger);
 
-            // this is so the model factory looks into the test assembly
-            pluginManager.AssembliesToScan = pluginManager.AssembliesToScan
-                .Union(new[] { typeof (PublishedContentMoreTests).Assembly })
-                .ToList();
-
-            return pluginManager;
+            return new TypeLoader(ioHelper, typeFinder, runtimeCache, new DirectoryInfo(globalSettings.LocalTempPath), logger, false,
+                // this is so the model factory looks into the test assembly
+                baseLoader.AssembliesToScan
+                    .Union(new[] {typeof(PublishedContentMoreTests).Assembly})
+                    .ToList());
         }
 
         private UmbracoContext GetUmbracoContext()
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
index f1e2bf20d6..bf55f1783f 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
@@ -40,7 +40,13 @@ namespace Umbraco.Tests.PublishedContent
             var converters = Factory.GetInstance<PropertyValueConverterCollection>();
 
             var dataTypeService = new TestObjects.TestDataTypeService(
-                new DataType(new RichTextPropertyEditor(Mock.Of<ILogger>(), Mock.Of<IMediaService>(), Mock.Of<IContentTypeBaseServiceProvider>(), Mock.Of<IUmbracoContextAccessor>())) { Id = 1 });
+                new DataType(new RichTextPropertyEditor(
+                    Mock.Of<ILogger>(),
+                    Mock.Of<IMediaService>(),
+                    Mock.Of<IContentTypeBaseServiceProvider>(),
+                    Mock.Of<IUmbracoContextAccessor>(),
+                    Mock.Of<IDataTypeService>(),
+                    Mock.Of<ILocalizationService>())) { Id = 1 });
 
             var publishedContentTypeFactory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), converters, dataTypeService);
 
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
index 6ef632bf90..7c70e82047 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Web;
 using NUnit.Framework;
@@ -14,6 +15,7 @@ using Moq;
 using Newtonsoft.Json;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Services;
@@ -45,13 +47,14 @@ namespace Umbraco.Tests.PublishedContent
             var mediaService = Mock.Of<IMediaService>();
             var contentTypeBaseServiceProvider = Mock.Of<IContentTypeBaseServiceProvider>();
             var umbracoContextAccessor = Mock.Of<IUmbracoContextAccessor>();
+            var localizationService = Mock.Of<ILocalizationService>();
 
             var dataTypeService = new TestObjects.TestDataTypeService(
                 new DataType(new VoidEditor(logger)) { Id = 1 },
                 new DataType(new TrueFalsePropertyEditor(logger)) { Id = 1001 },
-                new DataType(new RichTextPropertyEditor(logger, mediaService, contentTypeBaseServiceProvider, umbracoContextAccessor)) { Id = 1002 },
+                new DataType(new RichTextPropertyEditor(logger, mediaService, contentTypeBaseServiceProvider, umbracoContextAccessor, Mock.Of<IDataTypeService>(), localizationService)) { Id = 1002 },
                 new DataType(new IntegerPropertyEditor(logger)) { Id = 1003 },
-                new DataType(new TextboxPropertyEditor(logger)) { Id = 1004 },
+                new DataType(new TextboxPropertyEditor(logger, Mock.Of<IDataTypeService>(), localizationService)) { Id = 1004 },
                 new DataType(new MediaPickerPropertyEditor(logger)) { Id = 1005 });
             Composition.RegisterUnique<IDataTypeService>(f => dataTypeService);
         }
@@ -83,16 +86,16 @@ namespace Umbraco.Tests.PublishedContent
             ContentTypesCache.GetPublishedContentTypeByAlias = alias => alias.InvariantEquals("home") ? homeType : anythingType;
         }
 
-        protected override TypeLoader CreateTypeLoader(IAppPolicyCache runtimeCache, IGlobalSettings globalSettings, IProfilingLogger logger)
+
+        protected override TypeLoader CreateTypeLoader(IIOHelper ioHelper, ITypeFinder typeFinder, IAppPolicyCache runtimeCache, IGlobalSettings globalSettings, IProfilingLogger logger)
         {
-            var pluginManager = base.CreateTypeLoader(runtimeCache, globalSettings, logger);
+            var baseLoader = base.CreateTypeLoader(ioHelper, typeFinder, runtimeCache, globalSettings, logger);
 
-            // this is so the model factory looks into the test assembly
-            pluginManager.AssembliesToScan = pluginManager.AssembliesToScan
-                .Union(new[] { typeof(PublishedContentTests).Assembly })
-                .ToList();
-
-            return pluginManager;
+            return new TypeLoader(ioHelper, typeFinder, runtimeCache, new DirectoryInfo(globalSettings.LocalTempPath), logger, false,
+                // this is so the model factory looks into the test assembly
+                baseLoader.AssembliesToScan
+                    .Union(new[] { typeof(PublishedContentTests).Assembly })
+                    .ToList());
         }
 
         private readonly Guid _node1173Guid = Guid.NewGuid();
diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
index 83b968d4a3..38a2d68e13 100644
--- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
+++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs
@@ -61,15 +61,16 @@ namespace Umbraco.Tests.Runtimes
             var profilingLogger = new ProfilingLogger(logger, profiler);
             var appCaches = AppCaches.Disabled;
             var databaseFactory = new UmbracoDatabaseFactory(logger, new Lazy<IMapperCollection>(() => factory.GetInstance<IMapperCollection>()));
-            var typeLoader = new TypeLoader(appCaches.RuntimeCache, Current.IOHelper.MapPath("~/App_Data/TEMP"), profilingLogger);
+            var typeFinder = new TypeFinder(logger);
+            var ioHelper = IOHelper.Default;
+            var typeLoader = new TypeLoader(ioHelper, typeFinder, appCaches.RuntimeCache, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), profilingLogger);
             var mainDom = new SimpleMainDom();
             var runtimeState = new RuntimeState(logger, null, null, new Lazy<IMainDom>(() => mainDom), new Lazy<IServerRegistrar>(() => factory.GetInstance<IServerRegistrar>()));
-            var configs = new ConfigsFactory().Create();
 
             // create the register and the composition
             var register = RegisterFactory.Create();
-            var composition = new Composition(register, typeLoader, profilingLogger, runtimeState, configs);
-            composition.RegisterEssentials(logger, profiler, profilingLogger, mainDom, appCaches, databaseFactory, typeLoader, runtimeState);
+            var composition = new Composition(register, typeLoader, profilingLogger, runtimeState, TestHelper.GetConfigs());
+            composition.RegisterEssentials(logger, profiler, profilingLogger, mainDom, appCaches, databaseFactory, typeLoader, runtimeState, typeFinder, ioHelper);
 
             // create the core runtime and have it compose itself
             var coreRuntime = new CoreRuntime();
@@ -116,7 +117,7 @@ namespace Umbraco.Tests.Runtimes
             composition.Configs.Add(SettingsForTests.GetDefaultUmbracoSettings);
 
             // create and register the factory
-            Current.Factory = CurrentCore.Factory = factory = composition.CreateFactory();
+            Current.Factory = factory = composition.CreateFactory();
 
             // instantiate and initialize components
             var components = factory.GetInstance<ComponentCollection>();
@@ -250,17 +251,18 @@ namespace Umbraco.Tests.Runtimes
             var profilingLogger = new ProfilingLogger(logger, profiler);
             var appCaches = AppCaches.Disabled;
             var databaseFactory = Mock.Of<IUmbracoDatabaseFactory>();
-            var typeLoader = new TypeLoader(appCaches.RuntimeCache, Current.IOHelper.MapPath("~/App_Data/TEMP"), profilingLogger);
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var ioHelper = IOHelper.Default;
+            var typeLoader = new TypeLoader(ioHelper, typeFinder, appCaches.RuntimeCache, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), profilingLogger);
             var runtimeState = Mock.Of<IRuntimeState>();
             Mock.Get(runtimeState).Setup(x => x.Level).Returns(RuntimeLevel.Run);
             var mainDom = Mock.Of<IMainDom>();
             Mock.Get(mainDom).Setup(x => x.IsMainDom).Returns(true);
-            var configs = new ConfigsFactory().Create();
 
             // create the register and the composition
             var register = RegisterFactory.Create();
-            var composition = new Composition(register, typeLoader, profilingLogger, runtimeState, configs);
-            composition.RegisterEssentials(logger, profiler, profilingLogger, mainDom, appCaches, databaseFactory, typeLoader, runtimeState);
+            var composition = new Composition(register, typeLoader, profilingLogger, runtimeState, TestHelper.GetConfigs());
+            composition.RegisterEssentials(logger, profiler, profilingLogger, mainDom, appCaches, databaseFactory, typeLoader, runtimeState, typeFinder, ioHelper);
 
             // create the core runtime and have it compose itself
             var coreRuntime = new CoreRuntime();
diff --git a/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs b/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs
index 921c62e11f..297a84721d 100644
--- a/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopeEventDispatcherTests.cs
@@ -11,7 +11,6 @@ using Umbraco.Core.Scoping;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
 using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Persistence.Mappers;
 using Umbraco.Core.Services;
 using Umbraco.Tests.Components;
@@ -33,7 +32,7 @@ namespace Umbraco.Tests.Scoping
 
             var register = RegisterFactory.Create();
 
-            var composition = new Composition(register, new TypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), new ConfigsFactory().Create());
+            var composition = new Composition(register, TestHelper.GetMockedTypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run), TestHelper.GetConfigs());
 
             _testObjects = new TestObjects(register);
 
@@ -44,7 +43,7 @@ namespace Umbraco.Tests.Scoping
             composition.Configs.Add(SettingsForTests.GetDefaultUmbracoSettings);
 
             Current.Reset();
-            Current.Factory = CurrentCore.Factory = composition.CreateFactory();
+            Current.Factory = composition.CreateFactory();
 
             SettingsForTests.Reset(); // ensure we have configuration
         }
diff --git a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
index c7c403b260..0d2243c6dc 100644
--- a/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs
@@ -82,6 +82,8 @@ namespace Umbraco.Tests.Scoping
             var mediaRepository = Mock.Of<IMediaRepository>();
             var memberRepository = Mock.Of<IMemberRepository>();
 
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+
             return new PublishedSnapshotService(
                 options,
                 null,
@@ -99,7 +101,8 @@ namespace Umbraco.Tests.Scoping
                 Factory.GetInstance<IGlobalSettings>(),
                 Factory.GetInstance<IEntityXmlSerializer>(),
                 Mock.Of<IPublishedModelFactory>(),
-                new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider() }));
+                new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider() }),
+                typeFinder);
         }
 
         protected UmbracoContext GetUmbracoContextNu(string url, int templateId = 1234, RouteData routeData = null, bool setSingleton = false, IUmbracoSettingsSection umbracoSettings = null, IEnumerable<IUrlProvider> urlProviders = null)
diff --git a/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs b/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs
index c7e4ddcb19..ae4544bf87 100644
--- a/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs
+++ b/src/Umbraco.Tests/Scoping/ScopedRepositoryTests.cs
@@ -43,9 +43,9 @@ namespace Umbraco.Tests.Scoping
         {
             // this is what's created core web runtime
             return new AppCaches(
-                new DeepCloneAppCache(new ObjectCacheAppCache()),
+                new DeepCloneAppCache(new ObjectCacheAppCache(TypeFinder)),
                 NoAppCache.Instance,
-                new IsolatedCaches(type => new DeepCloneAppCache(new ObjectCacheAppCache())));
+                new IsolatedCaches(type => new DeepCloneAppCache(new ObjectCacheAppCache(TypeFinder))));
         }
 
         [TearDown]
diff --git a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
index 0fe05f385f..bc515cfea3 100644
--- a/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
+++ b/src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs
@@ -8,6 +8,7 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Persistence;
@@ -53,6 +54,8 @@ namespace Umbraco.Tests.Services
             var mediaRepository = Mock.Of<IMediaRepository>();
             var memberRepository = Mock.Of<IMemberRepository>();
 
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+
             return new PublishedSnapshotService(
                 options,
                 null,
@@ -70,7 +73,8 @@ namespace Umbraco.Tests.Services
                 Factory.GetInstance<IGlobalSettings>(),
                 Factory.GetInstance<IEntityXmlSerializer>(),
                 Mock.Of<IPublishedModelFactory>(),
-                new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider() }));
+                new UrlSegmentProviderCollection(new[] { new DefaultUrlSegmentProvider() }),
+                typeFinder);
         }
 
         public class LocalServerMessenger : ServerMessengerBase
diff --git a/src/Umbraco.Tests/Services/PropertyValidationServiceTests.cs b/src/Umbraco.Tests/Services/PropertyValidationServiceTests.cs
index 425c03a9b4..746190d67f 100644
--- a/src/Umbraco.Tests/Services/PropertyValidationServiceTests.cs
+++ b/src/Umbraco.Tests/Services/PropertyValidationServiceTests.cs
@@ -32,7 +32,7 @@ namespace Umbraco.Tests.Services
                 x => x.Type == EditorType.PropertyValue
                      && x.Alias == Constants.PropertyEditors.Aliases.TextBox);
             Mock.Get(dataEditor).Setup(x => x.GetValueEditor(It.IsAny<object>()))
-                .Returns(new CustomTextOnlyValueEditor(new DataEditorAttribute(Constants.PropertyEditors.Aliases.TextBox, "Test Textbox", "textbox"), textService.Object));
+                .Returns(new CustomTextOnlyValueEditor(Mock.Of<IDataTypeService>(), Mock.Of<ILocalizationService>(), new DataEditorAttribute(Constants.PropertyEditors.Aliases.TextBox, "Test Textbox", "textbox"),   textService.Object));
 
             var propEditors = new PropertyEditorCollection(new DataEditorCollection(new[] { dataEditor }));
 
@@ -164,7 +164,7 @@ namespace Umbraco.Tests.Services
         {
             private readonly ILocalizedTextService _textService;
 
-            public CustomTextOnlyValueEditor(DataEditorAttribute attribute, ILocalizedTextService textService) : base(attribute)
+            public CustomTextOnlyValueEditor(IDataTypeService dataTypeService, ILocalizationService localizationService, DataEditorAttribute attribute, ILocalizedTextService textService) : base(dataTypeService, localizationService, attribute)
             {
                 _textService = textService;
             }
diff --git a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
index 91477c8f15..3aa4495601 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseUsingSqlCeSyntax.cs
@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using Moq;
 using NPoco;
 using NUnit.Framework;
@@ -36,9 +37,11 @@ namespace Umbraco.Tests.TestHelpers
 
             var container = RegisterFactory.Create();
 
+            var ioHelper = IOHelper.Default;
             var logger = new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
-            var typeLoader = new TypeLoader(NoAppCache.Instance,
-                Current.IOHelper.MapPath("~/App_Data/TEMP"),
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var typeLoader = new TypeLoader(ioHelper, typeFinder, NoAppCache.Instance,
+                new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")),
                 logger,
                 false);
 
@@ -54,7 +57,7 @@ namespace Umbraco.Tests.TestHelpers
 
             composition.RegisterUnique<ISqlContext>(_ => SqlContext);
 
-            var factory = Current.Factory = CurrentCore.Factory = composition.CreateFactory();
+            var factory = Current.Factory = composition.CreateFactory();
 
             var pocoMappers = new NPoco.MapperCollection { new PocoMapper() };
             var pocoDataFactory = new FluentPocoDataFactory((type, iPocoDataFactory) => new PocoDataBuilder(type, pocoMappers).Init());
diff --git a/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs b/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs
index e27fe17bbe..273f7a996e 100644
--- a/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs
+++ b/src/Umbraco.Tests/TestHelpers/Stubs/TestControllerFactory.cs
@@ -5,6 +5,7 @@ using System.Reflection;
 using System.Web.Mvc;
 using System.Web.Routing;
 using System.Web.SessionState;
+using Moq;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Composing;
@@ -38,7 +39,8 @@ namespace Umbraco.Tests.TestHelpers.Stubs
         {
             if (_factory != null) return _factory(requestContext);
 
-            var types = TypeFinder.FindClassesOfType<ControllerBase>(new[] { Assembly.GetExecutingAssembly() });
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var types = typeFinder.FindClassesOfType<ControllerBase>(new[] { Assembly.GetExecutingAssembly() });
 
             var controllerTypes = types.Where(x => x.Name.Equals(controllerName + "Controller", StringComparison.InvariantCultureIgnoreCase));
             var t = controllerTypes.SingleOrDefault();
diff --git a/src/Umbraco.Tests/TestHelpers/TestHelper.cs b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
index 647797a500..f9365c5526 100644
--- a/src/Umbraco.Tests/TestHelpers/TestHelper.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestHelper.cs
@@ -7,13 +7,18 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Threading;
+using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
+using Umbraco.Core.Cache;
 using Umbraco.Core.Composing;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
 using File = System.IO.File;
 
 namespace Umbraco.Tests.TestHelpers
@@ -24,13 +29,21 @@ namespace Umbraco.Tests.TestHelpers
     public static class TestHelper
     {
 
+        public static TypeLoader GetMockedTypeLoader()
+        {
+            return new TypeLoader(IOHelper.Default, Mock.Of<ITypeFinder>(), Mock.Of<IAppPolicyCache>(), new DirectoryInfo(IOHelper.Default.MapPath("~/App_Data/TEMP")), Mock.Of<IProfilingLogger>());
+        }
 
+        public static Configs GetConfigs()
+        {
+            return new ConfigsFactory().Create();
+        }
 
         /// <summary>
         /// Gets the current assembly directory.
         /// </summary>
         /// <value>The assembly directory.</value>
-        static public string CurrentAssemblyDirectory
+        public static string CurrentAssemblyDirectory
         {
             get
             {
@@ -241,5 +254,20 @@ namespace Umbraco.Tests.TestHelpers
                 }
             }
         }
+
+        public static DataValueEditor CreateDataValueEditor(string name)
+        {
+            var valueType = (ValueTypes.IsValue(name)) ? name : ValueTypes.String;
+
+            return new DataValueEditor(
+                Mock.Of<IDataTypeService>(),
+                Mock.Of<ILocalizationService>(),
+                new DataEditorAttribute(name, name, name)
+                {
+                    ValueType = valueType
+                }
+
+            );
+        }
     }
 }
diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
index 22858c2aed..280632fdae 100644
--- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs
+++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs
@@ -157,7 +157,7 @@ namespace Umbraco.Tests.TestHelpers
             var notificationService = GetLazyService<INotificationService>(factory, c => new NotificationService(scopeProvider, userService.Value, contentService.Value, localizationService.Value, logger, GetRepo<INotificationsRepository>(c), globalSettings, umbracoSettings.Content));
             var serverRegistrationService = GetLazyService<IServerRegistrationService>(factory, c => new ServerRegistrationService(scopeProvider, logger, eventMessagesFactory, GetRepo<IServerRegistrationRepository>(c)));
             var memberGroupService = GetLazyService<IMemberGroupService>(factory, c => new MemberGroupService(scopeProvider, logger, eventMessagesFactory, GetRepo<IMemberGroupRepository>(c)));
-            var memberService = GetLazyService<IMemberService>(factory, c => new MemberService(scopeProvider, logger, eventMessagesFactory, memberGroupService.Value, mediaFileSystem, GetRepo<IMemberRepository>(c), GetRepo<IMemberTypeRepository>(c), GetRepo<IMemberGroupRepository>(c), GetRepo<IAuditRepository>(c)));
+            var memberService = GetLazyService<IMemberService>(factory, c => new MemberService(scopeProvider, logger, eventMessagesFactory, memberGroupService.Value, GetRepo<IMemberRepository>(c), GetRepo<IMemberTypeRepository>(c), GetRepo<IMemberGroupRepository>(c), GetRepo<IAuditRepository>(c)));
             var mediaService = GetLazyService<IMediaService>(factory, c => new MediaService(scopeProvider, mediaFileSystem, logger, eventMessagesFactory, GetRepo<IMediaRepository>(c), GetRepo<IAuditRepository>(c), GetRepo<IMediaTypeRepository>(c), GetRepo<IEntityRepository>(c)));
             var contentTypeService = GetLazyService<IContentTypeService>(factory, c => new ContentTypeService(scopeProvider, logger, eventMessagesFactory, contentService.Value, GetRepo<IContentTypeRepository>(c), GetRepo<IAuditRepository>(c), GetRepo<IDocumentTypeContainerRepository>(c), GetRepo<IEntityRepository>(c)));
             var mediaTypeService = GetLazyService<IMediaTypeService>(factory, c => new MediaTypeService(scopeProvider, logger, eventMessagesFactory, mediaService.Value, GetRepo<IMediaTypeRepository>(c), GetRepo<IAuditRepository>(c), GetRepo<IMediaTypeContainerRepository>(c), GetRepo<IEntityRepository>(c)));
@@ -230,7 +230,7 @@ namespace Umbraco.Tests.TestHelpers
             return container?.TryGetInstance<T>() ?? Mock.Of<T>();
         }
 
-        public IScopeProvider GetScopeProvider(ILogger logger, FileSystems fileSystems = null, IUmbracoDatabaseFactory databaseFactory = null)
+        public IScopeProvider GetScopeProvider(ILogger logger, ITypeFinder typeFinder = null, FileSystems fileSystems = null, IUmbracoDatabaseFactory databaseFactory = null)
         {
             if (databaseFactory == null)
             {
@@ -241,8 +241,9 @@ namespace Umbraco.Tests.TestHelpers
                 databaseFactory = new UmbracoDatabaseFactory(Constants.System.UmbracoConnectionName, logger, new Lazy<IMapperCollection>(() => mappers));
             }
 
+            typeFinder = typeFinder ?? new TypeFinder(logger);
             fileSystems = fileSystems ?? new FileSystems(Current.Factory, logger);
-            var scopeProvider = new ScopeProvider(databaseFactory, fileSystems, logger);
+            var scopeProvider = new ScopeProvider(databaseFactory, fileSystems, logger, typeFinder);
             return scopeProvider;
         }
     }
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index d337108cc9..d11bf8e5d7 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -99,6 +99,10 @@ namespace Umbraco.Tests.Testing
 
         protected ILogger Logger => Factory.GetInstance<ILogger>();
 
+        protected IIOHelper IOHelper { get; private set; }
+
+        protected ITypeFinder TypeFinder { get; private set; }
+
         protected IProfiler Profiler => Factory.GetInstance<IProfiler>();
 
         protected virtual IProfilingLogger ProfilingLogger => Factory.GetInstance<IProfilingLogger>();
@@ -129,14 +133,19 @@ namespace Umbraco.Tests.Testing
 
             var (logger, profiler) = GetLoggers(Options.Logger);
             var proflogger = new ProfilingLogger(logger, profiler);
+            IOHelper = Umbraco.Core.IO.IOHelper.Default;
+            TypeFinder = new TypeFinder(logger);
             var appCaches = GetAppCaches();
             var globalSettings = SettingsForTests.GetDefaultGlobalSettings();
-            var typeLoader = GetTypeLoader(appCaches.RuntimeCache, globalSettings, proflogger, Options.TypeLoader);
+            var typeLoader = GetTypeLoader(IOHelper, TypeFinder, appCaches.RuntimeCache, globalSettings, proflogger, Options.TypeLoader);
 
             var register = RegisterFactory.Create();
 
             Composition = new Composition(register, typeLoader, proflogger, ComponentTests.MockRuntimeState(RuntimeLevel.Run), new ConfigsFactory().Create());
 
+
+            Composition.RegisterUnique(IOHelper);
+            Composition.RegisterUnique(TypeFinder);
             Composition.RegisterUnique(typeLoader);
             Composition.RegisterUnique(logger);
             Composition.RegisterUnique(profiler);
@@ -145,7 +154,7 @@ namespace Umbraco.Tests.Testing
 
             TestObjects = new TestObjects(register);
             Compose();
-            Current.Factory = CurrentCore.Factory = Factory = Composition.CreateFactory();
+            Current.Factory = Factory = Composition.CreateFactory();
             Initialize();
         }
 
@@ -219,6 +228,7 @@ namespace Umbraco.Tests.Testing
             Composition.RegisterUnique<IContentLastChanceFinder, TestLastChanceFinder>();
             Composition.RegisterUnique<IVariationContextAccessor, TestVariationContextAccessor>();
             Composition.RegisterUnique<IPublishedSnapshotAccessor, TestPublishedSnapshotAccessor>();
+            Composition.RegisterUnique<IIOHelper, IOHelper>();
 
             // register back office sections in the order we want them rendered
             Composition.WithCollectionBuilder<SectionCollectionBuilder>().Append<ContentSection>()
@@ -265,38 +275,35 @@ namespace Umbraco.Tests.Testing
                 .ComposeWebMappingProfiles();
         }
 
-        protected virtual TypeLoader GetTypeLoader(IAppPolicyCache runtimeCache, IGlobalSettings globalSettings, IProfilingLogger logger, UmbracoTestOptions.TypeLoader option)
+        protected virtual TypeLoader GetTypeLoader(IIOHelper ioHelper, ITypeFinder typeFinder, IAppPolicyCache runtimeCache, IGlobalSettings globalSettings, IProfilingLogger logger, UmbracoTestOptions.TypeLoader option)
         {
             switch (option)
             {
                 case UmbracoTestOptions.TypeLoader.Default:
-                    return _commonTypeLoader ?? (_commonTypeLoader = CreateCommonTypeLoader(runtimeCache, globalSettings, logger));
+                    return _commonTypeLoader ?? (_commonTypeLoader = CreateCommonTypeLoader(ioHelper, typeFinder, runtimeCache, globalSettings, logger));
                 case UmbracoTestOptions.TypeLoader.PerFixture:
-                    return _featureTypeLoader ?? (_featureTypeLoader = CreateTypeLoader(runtimeCache, globalSettings, logger));
+                    return _featureTypeLoader ?? (_featureTypeLoader = CreateTypeLoader(ioHelper, typeFinder, runtimeCache, globalSettings, logger));
                 case UmbracoTestOptions.TypeLoader.PerTest:
-                    return CreateTypeLoader(runtimeCache, globalSettings, logger);
+                    return CreateTypeLoader(ioHelper, typeFinder, runtimeCache, globalSettings, logger);
                 default:
                     throw new ArgumentOutOfRangeException(nameof(option));
             }
         }
 
-        protected virtual TypeLoader CreateTypeLoader(IAppPolicyCache runtimeCache, IGlobalSettings globalSettings, IProfilingLogger logger)
+        protected virtual TypeLoader CreateTypeLoader(IIOHelper ioHelper, ITypeFinder typeFinder, IAppPolicyCache runtimeCache, IGlobalSettings globalSettings, IProfilingLogger logger)
         {
-            return CreateCommonTypeLoader(runtimeCache, globalSettings, logger);
+            return CreateCommonTypeLoader(ioHelper, typeFinder, runtimeCache, globalSettings, logger);
         }
 
         // common to all tests = cannot be overriden
-        private static TypeLoader CreateCommonTypeLoader(IAppPolicyCache runtimeCache, IGlobalSettings globalSettings, IProfilingLogger logger)
+        private static TypeLoader CreateCommonTypeLoader(IIOHelper ioHelper, ITypeFinder typeFinder, IAppPolicyCache runtimeCache, IGlobalSettings globalSettings, IProfilingLogger logger)
         {
-            return new TypeLoader(runtimeCache, globalSettings.LocalTempPath, logger, false)
+            return new TypeLoader(ioHelper, typeFinder, runtimeCache, new DirectoryInfo(globalSettings.LocalTempPath), logger, false, new[]
             {
-                AssembliesToScan = new[]
-                {
-                    Assembly.Load("Umbraco.Core"),
-                    Assembly.Load("Umbraco.Web"),
-                    Assembly.Load("Umbraco.Tests")
-                }
-            };
+                Assembly.Load("Umbraco.Core"),
+                Assembly.Load("Umbraco.Web"),
+                Assembly.Load("Umbraco.Tests")
+            });
         }
 
         protected virtual void ComposeDatabase(UmbracoTestOptions.Database option)
@@ -357,7 +364,7 @@ namespace Umbraco.Tests.Testing
             Composition.WithCollectionBuilder<UrlSegmentProviderCollectionBuilder>(); // empty
 
             Composition.RegisterUnique(factory
-                => TestObjects.GetScopeProvider(factory.TryGetInstance<ILogger>(), factory.TryGetInstance<FileSystems>(), factory.TryGetInstance<IUmbracoDatabaseFactory>()));
+                => TestObjects.GetScopeProvider(factory.TryGetInstance<ILogger>(), factory.TryGetInstance<ITypeFinder>(), factory.TryGetInstance<FileSystems>(), factory.TryGetInstance<IUmbracoDatabaseFactory>()));
             Composition.RegisterUnique(factory => (IScopeAccessor) factory.GetInstance<IScopeProvider>());
 
             Composition.ComposeServices();
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 4f4a20d94e..45d5386e6a 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -56,7 +56,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.Entity.Design" />
@@ -108,6 +107,7 @@
     <PackageReference Include="Owin" Version="1.0" />
     <PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0" />
     <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
   </ItemGroup>
diff --git a/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs b/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs
index ba66b04a6e..eeb1eb4b37 100644
--- a/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs
+++ b/src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs
@@ -34,7 +34,6 @@ namespace Umbraco.Tests.Web.Mvc
         {
             Current.UmbracoContextAccessor = new TestUmbracoContextAccessor();
             Core.Composing.Current.Factory = Mock.Of<IFactory>();
-            Core.Composing.CurrentCore.Factory = Mock.Of<IFactory>();
         }
 
         [TearDown]
diff --git a/src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs b/src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
index 040b3ab51c..e3678a1db5 100644
--- a/src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
+++ b/src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Linq;
 using System.Web;
 using Moq;
@@ -39,14 +40,16 @@ namespace Umbraco.Tests.Web
 
             // FIXME: bad in a unit test - but Udi has a static ctor that wants it?!
             var factory = new Mock<IFactory>();
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var ioHelper = IOHelper.Default;
             factory.Setup(x => x.GetInstance(typeof(TypeLoader))).Returns(
-                new TypeLoader(NoAppCache.Instance, Current.IOHelper.MapPath("~/App_Data/TEMP"), new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>())));
+                new TypeLoader(ioHelper, typeFinder, NoAppCache.Instance, new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")), new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>())));
             factory.Setup(x => x.GetInstance(typeof (ServiceContext))).Returns(serviceContext);
 
             var settings = SettingsForTests.GetDefaultUmbracoSettings();
             factory.Setup(x => x.GetInstance(typeof(IUmbracoSettingsSection))).Returns(settings);
 
-            Current.Factory = CurrentCore.Factory = factory.Object;
+            Current.Factory = factory.Object;
 
             Umbraco.Web.Composing.Current.UmbracoContextAccessor = new TestUmbracoContextAccessor();
 
diff --git a/src/Umbraco.Tests/Web/UmbracoHelperTests.cs b/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
index 19f0767f0b..cdf17e12e9 100644
--- a/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
+++ b/src/Umbraco.Tests/Web/UmbracoHelperTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Text;
 using Examine.LuceneEngine;
 using Lucene.Net.Analysis;
@@ -259,18 +260,20 @@ namespace Umbraco.Tests.Web
         {
             // FIXME: bad in a unit test - but Udi has a static ctor that wants it?!
             var container = new Mock<IFactory>();
-            var globalSettings = SettingsForTests.GenerateMockGlobalSettings();
-
+            var typeFinder = new TypeFinder(Mock.Of<ILogger>());
+            var ioHelper = IOHelper.Default;
             container
                 .Setup(x => x.GetInstance(typeof(TypeLoader)))
                 .Returns(new TypeLoader(
+                    ioHelper,
+                    typeFinder,
                     NoAppCache.Instance,
-                    Current.IOHelper.MapPath("~/App_Data/TEMP"),
+                    new DirectoryInfo(ioHelper.MapPath("~/App_Data/TEMP")),
                     new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>())
                     )
                 );
 
-            Current.Factory = CurrentCore.Factory = container.Object;
+            Current.Factory = container.Object;
         }
     }
 }
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index f2976716bb..a2ce0f95f7 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -70,7 +70,6 @@
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Abstractions" />
     <Reference Include="System.Web.ApplicationServices" />
@@ -110,6 +109,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0" />
     <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
   </ItemGroup>
   <ItemGroup>
@@ -432,4 +432,4 @@
     <Message Text="ConfigFile: $(OriginalFileName) -&gt; $(OutputFileName)" Importance="high" Condition="Exists('$(ModifiedFileName)')" />
     <Copy SourceFiles="$(ModifiedFileName)" DestinationFiles="$(OutputFileName)" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="false" Condition="Exists('$(ModifiedFileName)')" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs b/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs
index 3b2cf3e23d..c56b7a094f 100644
--- a/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs
+++ b/src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs
@@ -380,8 +380,8 @@ namespace Umbraco.Web.Cache
         }
 
         // TODO: our weird events handling wants this for now
-        private void FileService_DeletedStylesheet(IFileService sender, DeleteEventArgs<Stylesheet> e) { }
-        private void FileService_SavedStylesheet(IFileService sender, SaveEventArgs<Stylesheet> e) { }
+        private void FileService_DeletedStylesheet(IFileService sender, DeleteEventArgs<IStylesheet> e) { }
+        private void FileService_SavedStylesheet(IFileService sender, SaveEventArgs<IStylesheet> e) { }
 
         #endregion
 
diff --git a/src/Umbraco.Core/Cache/WebCachingAppCache.cs b/src/Umbraco.Web/Cache/WebCachingAppCache.cs
similarity index 98%
rename from src/Umbraco.Core/Cache/WebCachingAppCache.cs
rename to src/Umbraco.Web/Cache/WebCachingAppCache.cs
index 362df8f603..1879e8b69b 100644
--- a/src/Umbraco.Core/Cache/WebCachingAppCache.cs
+++ b/src/Umbraco.Web/Cache/WebCachingAppCache.cs
@@ -4,8 +4,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Web.Caching;
+using Umbraco.Core;
+using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
 
-namespace Umbraco.Core.Cache
+namespace Umbraco.Web.Cache
 {
     /// <summary>
     /// Implements <see cref="IAppPolicyCache"/> on top of a <see cref="System.Web.Caching.Cache"/>.
@@ -23,7 +26,7 @@ namespace Umbraco.Core.Cache
         /// <summary>
         /// Initializes a new instance of the <see cref="WebCachingAppCache"/> class.
         /// </summary>
-        public WebCachingAppCache(System.Web.Caching.Cache cache)
+        public WebCachingAppCache(System.Web.Caching.Cache cache, ITypeFinder typeFinder) : base(typeFinder)
         {
             _cache = cache;
         }
diff --git a/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs b/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs
new file mode 100644
index 0000000000..15c8d6d8d6
--- /dev/null
+++ b/src/Umbraco.Web/Composing/BuildManagerTypeFinder.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Security;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web.Compilation;
+using Umbraco.Core;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
+
+namespace Umbraco.Web.Composing
+{
+    /// <summary>
+    /// An implementation of TypeFinder that uses the BuildManager to resolve references for aspnet framework hosted websites
+    /// </summary>
+    /// <remarks>
+    /// This finder will also try to resolve dynamic assemblies created from App_Code
+    /// </remarks>
+    internal class BuildManagerTypeFinder : TypeFinder, ITypeFinder
+    {
+        
+        public BuildManagerTypeFinder(IIOHelper ioHelper, ILogger logger, ITypeFinderConfig typeFinderConfig = null) : base(logger, typeFinderConfig)
+        {
+            if (ioHelper == null) throw new ArgumentNullException(nameof(ioHelper));
+            if (logger == null) throw new ArgumentNullException(nameof(logger));
+
+            _allAssemblies = new Lazy<HashSet<Assembly>>(() =>
+            {
+                var isHosted = ioHelper.IsHosted;
+                try
+                {
+                    if (isHosted)
+                    {
+                        var assemblies = new HashSet<Assembly>(BuildManager.GetReferencedAssemblies().Cast<Assembly>());
+
+                        //here we are trying to get the App_Code assembly
+                        var fileExtensions = new[] { ".cs", ".vb" }; //only vb and cs files are supported
+                        var appCodeFolder = new DirectoryInfo(ioHelper.MapPath(ioHelper.ResolveUrl("~/App_code")));
+                        //check if the folder exists and if there are any files in it with the supported file extensions
+                        if (appCodeFolder.Exists && fileExtensions.Any(x => appCodeFolder.GetFiles("*" + x).Any()))
+                        {
+                            try
+                            {
+                                var appCodeAssembly = Assembly.Load("App_Code");
+                                if (assemblies.Contains(appCodeAssembly) == false) // BuildManager will find App_Code already
+                                    assemblies.Add(appCodeAssembly);
+                            }
+                            catch (FileNotFoundException ex)
+                            {
+                                //this will occur if it cannot load the assembly
+                                logger.Error(typeof(TypeFinder), ex, "Could not load assembly App_Code");
+                            }
+                        }
+                    }
+                }
+                catch (InvalidOperationException e)
+                {
+                    if (e.InnerException is SecurityException == false)
+                        throw;
+                }
+
+                // Not hosted, just use the default implementation
+                return new HashSet<Assembly>(base.AssembliesToScan);
+            });
+        }
+
+        private readonly Lazy<HashSet<Assembly>> _allAssemblies;
+
+        /// <summary>
+        /// Explicitly implement and return result from BuildManager
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        Type ITypeFinder.GetTypeByName (string name) => BuildManager.GetType(name, false);
+
+        /// <summary>
+        /// Explicitly implement and return result from BuildManager
+        /// </summary>
+        IEnumerable<Assembly> ITypeFinder.AssembliesToScan => _allAssemblies.Value;
+
+        /// <summary>
+        /// TypeFinder config via appSettings
+        /// </summary>
+        internal class TypeFinderConfig : ITypeFinderConfig
+        {
+            private IEnumerable<string> _assembliesAcceptingLoadExceptions;
+            public IEnumerable<string> AssembliesAcceptingLoadExceptions
+            {
+                get
+                {
+                    if (_assembliesAcceptingLoadExceptions != null)
+                        return _assembliesAcceptingLoadExceptions;
+
+                    var s = ConfigurationManager.AppSettings[Constants.AppSettings.AssembliesAcceptingLoadExceptions];
+                    return _assembliesAcceptingLoadExceptions = string.IsNullOrWhiteSpace(s)
+                        ? Array.Empty<string>()
+                        : s.Split(',').Select(x => x.Trim()).ToArray();
+                }
+            }
+        }
+    }
+}
diff --git a/src/Umbraco.Web/ContentApps/ContentAppFactoryCollectionBuilder.cs b/src/Umbraco.Web/ContentApps/ContentAppFactoryCollectionBuilder.cs
index 233a5f5ac6..0561cc06f0 100644
--- a/src/Umbraco.Web/ContentApps/ContentAppFactoryCollectionBuilder.cs
+++ b/src/Umbraco.Web/ContentApps/ContentAppFactoryCollectionBuilder.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Composing;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.Models.ContentEditing;
@@ -28,7 +29,7 @@ namespace Umbraco.Web.ContentApps
             // its dependencies too, and that can create cycles or other oddities
             var manifestParser = factory.GetInstance<IManifestParser>();
 
-            return base.CreateItems(factory).Concat(manifestParser.Manifest.ContentApps.Select(x => new ManifestContentAppFactory(x)));
+            return base.CreateItems(factory).Concat(manifestParser.Manifest.ContentApps.Select(x => new ManifestContentAppFactory(x, Current.IOHelper)));
         }
     }
 }
diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs
index ae870f695e..a4e89c25f2 100644
--- a/src/Umbraco.Web/Editors/CodeFileController.cs
+++ b/src/Umbraco.Web/Editors/CodeFileController.cs
@@ -178,7 +178,7 @@ namespace Umbraco.Web.Editors
                     var script = Services.FileService.GetScriptByName(virtualPath);
                     if (script != null)
                     {
-                        var display = Mapper.Map<Script, CodeFileDisplay>(script);
+                        var display = Mapper.Map<IScript, CodeFileDisplay>(script);
                         display.FileType = Core.Constants.Trees.Scripts;
                         display.Path = Url.GetTreePathFromFilePath(script.Path);
                         display.Id = System.Web.HttpUtility.UrlEncode(script.Path);
@@ -190,7 +190,7 @@ namespace Umbraco.Web.Editors
                     var stylesheet = Services.FileService.GetStylesheetByName(virtualPath);
                     if (stylesheet != null)
                     {
-                        var display = Mapper.Map<Stylesheet, CodeFileDisplay>(stylesheet);
+                        var display = Mapper.Map<IStylesheet, CodeFileDisplay>(stylesheet);
                         display.FileType = Core.Constants.Trees.Stylesheets;
                         display.Path = Url.GetTreePathFromFilePath(stylesheet.Path);
                         display.Id = System.Web.HttpUtility.UrlEncode(stylesheet.Path);
@@ -503,7 +503,7 @@ namespace Umbraco.Web.Editors
         /// It's important to note that Scripts are DIFFERENT from cshtml files since scripts use IFileSystem and cshtml files
         /// use a normal file system because they must exist on a real file system for ASP.NET to work.
         /// </remarks>
-        private Script CreateOrUpdateScript(CodeFileDisplay display)
+        private IScript CreateOrUpdateScript(CodeFileDisplay display)
         {
             return CreateOrUpdateFile(display, ".js", Current.FileSystems.ScriptsFileSystem,
                 name => Services.FileService.GetScriptByName(name),
@@ -511,7 +511,7 @@ namespace Umbraco.Web.Editors
                 name => new Script(name));
         }
 
-        private Stylesheet CreateOrUpdateStylesheet(CodeFileDisplay display)
+        private IStylesheet CreateOrUpdateStylesheet(CodeFileDisplay display)
         {
             return CreateOrUpdateFile(display, ".css", Current.FileSystems.StylesheetsFileSystem,
                 name => Services.FileService.GetStylesheetByName(name),
@@ -521,7 +521,7 @@ namespace Umbraco.Web.Editors
         }
 
         private T CreateOrUpdateFile<T>(CodeFileDisplay display, string extension, IFileSystem fileSystem,
-            Func<string, T> getFileByName, Action<T, int> saveFile, Func<string, T> createFile) where T : Core.Models.File
+            Func<string, T> getFileByName, Action<T, int> saveFile, Func<string, T> createFile) where T : Core.Models.IFile
         {
             //must always end with the correct extension
             display.Name = EnsureCorrectFileExtension(display.Name, extension);
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 5c8e6fc2b5..11cc59a464 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -1837,7 +1837,7 @@ namespace Umbraco.Web.Editors
         private void MapValuesForPersistence(ContentItemSave contentSave)
         {
             // inline method to determine if a property type varies
-            bool Varies(Property property) => property.PropertyType.VariesByCulture();
+            bool Varies(IProperty property) => property.PropertyType.VariesByCulture();
 
             var variantIndex = 0;
 
diff --git a/src/Umbraco.Web/Editors/ContentControllerBase.cs b/src/Umbraco.Web/Editors/ContentControllerBase.cs
index 300c777b3a..83167eb9ae 100644
--- a/src/Umbraco.Web/Editors/ContentControllerBase.cs
+++ b/src/Umbraco.Web/Editors/ContentControllerBase.cs
@@ -50,8 +50,8 @@ namespace Umbraco.Web.Editors
         internal void MapPropertyValuesForPersistence<TPersisted, TSaved>(
             TSaved contentItem,
             ContentPropertyCollectionDto dto,
-            Func<TSaved, Property, object> getPropertyValue,
-            Action<TSaved, Property, object> savePropertyValue,
+            Func<TSaved, IProperty, object> getPropertyValue,
+            Action<TSaved, IProperty, object> savePropertyValue,
             string culture)
             where TPersisted : IContentBase
             where TSaved : IContentSave<TPersisted>
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index 7113abd6eb..aa8f735cf2 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -486,6 +486,7 @@ namespace Umbraco.Web.Editors
         /// <param name="orderBy"></param>
         /// <param name="orderDirection"></param>
         /// <param name="filter"></param>
+        /// <param name="dataTypeKey"></param>
         /// <returns></returns>
         public PagedResult<EntityBasic> GetPagedChildren(
             string id,
diff --git a/src/Umbraco.Web/Editors/Filters/ContentModelValidator.cs b/src/Umbraco.Web/Editors/Filters/ContentModelValidator.cs
index 4acf0c948e..14531227e1 100644
--- a/src/Umbraco.Web/Editors/Filters/ContentModelValidator.cs
+++ b/src/Umbraco.Web/Editors/Filters/ContentModelValidator.cs
@@ -46,7 +46,7 @@ namespace Umbraco.Web.Editors.Filters
         protected ContentModelValidator(ILogger logger, IUmbracoContextAccessor umbracoContextAccessor) : base(logger, umbracoContextAccessor)
         {
         }
-        
+
         /// <summary>
         /// Ensure the content exists
         /// </summary>
@@ -85,7 +85,7 @@ namespace Umbraco.Web.Editors.Filters
         /// <param name="persistedProperties"></param>
         /// <param name="actionContext"></param>
         /// <returns></returns>
-        protected bool ValidateProperties(List<ContentPropertyBasic> postedProperties, List<Property> persistedProperties, HttpActionContext actionContext)
+        protected bool ValidateProperties(List<ContentPropertyBasic> postedProperties, List<IProperty> persistedProperties, HttpActionContext actionContext)
         {
             foreach (var p in postedProperties)
             {
@@ -142,7 +142,7 @@ namespace Umbraco.Web.Editors.Filters
                 var postedValue = postedProp.Value;
 
                 ValidatePropertyValue(model, modelWithProperties, editor, p, postedValue, modelState);
-    
+
             }
 
             return modelState.IsValid;
diff --git a/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs b/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
index 41f0e2fb65..cab20926ff 100644
--- a/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
+++ b/src/Umbraco.Web/Macros/PublishedContentHashtableConverter.cs
@@ -147,7 +147,7 @@ namespace Umbraco.Web.Macros
                 _content = content;
             }
 
-            public PagePublishedProperty(IPublishedPropertyType propertyType, IPublishedContent content, Umbraco.Core.Models.Property property)
+            public PagePublishedProperty(IPublishedPropertyType propertyType, IPublishedContent content, IProperty property)
                 : base(propertyType, PropertyCacheLevel.Unknown) // cache level is ignored
             {
                 _sourceValue = property.GetValue();
diff --git a/src/Umbraco.Web/Models/Mapping/CodeFileMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/CodeFileMapDefinition.cs
index 6af9d9149e..571a994539 100644
--- a/src/Umbraco.Web/Models/Mapping/CodeFileMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/CodeFileMapDefinition.cs
@@ -9,17 +9,17 @@ namespace Umbraco.Web.Models.Mapping
     {
         public void DefineMaps(UmbracoMapper mapper)
         {
-            mapper.Define<Stylesheet, EntityBasic>((source, context) => new EntityBasic(), Map);
+            mapper.Define<IStylesheet, EntityBasic>((source, context) => new EntityBasic(), Map);
             mapper.Define<IPartialView, CodeFileDisplay>((source, context) => new CodeFileDisplay(), Map);
-            mapper.Define<Script, CodeFileDisplay>((source, context) => new CodeFileDisplay(), Map);
-            mapper.Define<Stylesheet, CodeFileDisplay>((source, context) => new CodeFileDisplay(), Map);
+            mapper.Define<IScript, CodeFileDisplay>((source, context) => new CodeFileDisplay(), Map);
+            mapper.Define<IStylesheet, CodeFileDisplay>((source, context) => new CodeFileDisplay(), Map);
             mapper.Define<CodeFileDisplay, IPartialView>(Map);
-            mapper.Define<CodeFileDisplay, Script>(Map);
+            mapper.Define<CodeFileDisplay, IScript>(Map);
 
         }
 
         // Umbraco.Code.MapAll -Trashed -Udi -Icon
-        private static void Map(Stylesheet source, EntityBasic target, MapperContext context)
+        private static void Map(IStylesheet source, EntityBasic target, MapperContext context)
         {
             target.Alias = source.Alias;
             target.Id = source.Id;
@@ -39,7 +39,7 @@ namespace Umbraco.Web.Models.Mapping
         }
 
         // Umbraco.Code.MapAll -FileType -Notifications -Path -Snippet
-        private static void Map(Script source, CodeFileDisplay target, MapperContext context)
+        private static void Map(IScript source, CodeFileDisplay target, MapperContext context)
         {
             target.Content = source.Content;
             target.Id = source.Id.ToString();
@@ -48,7 +48,7 @@ namespace Umbraco.Web.Models.Mapping
         }
 
         // Umbraco.Code.MapAll -FileType -Notifications -Path -Snippet
-        private static void Map(Stylesheet source, CodeFileDisplay target, MapperContext context)
+        private static void Map(IStylesheet source, CodeFileDisplay target, MapperContext context)
         {
             target.Content = source.Content;
             target.Id = source.Id.ToString();
@@ -66,7 +66,7 @@ namespace Umbraco.Web.Models.Mapping
 
         // Umbraco.Code.MapAll -CreateDate -DeleteDate -UpdateDate -GetFileContent
         // Umbraco.Code.MapAll -Id -Key -Alias -Name -OriginalPath -Path
-        private static void Map(CodeFileDisplay source, Script target, MapperContext context)
+        private static void Map(CodeFileDisplay source, IScript target, MapperContext context)
         {
             target.Content = source.Content;
             target.VirtualPath = source.VirtualPath;
diff --git a/src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
index dc0df4ca96..d3b4353f2f 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
@@ -64,7 +64,7 @@ namespace Umbraco.Web.Models.Mapping
         // Umbraco.Code.MapAll
         private static void Map(IContent source, ContentPropertyCollectionDto target, MapperContext context)
         {
-            target.Properties = context.MapEnumerable<Property, ContentPropertyDto>(source.Properties);
+            target.Properties = context.MapEnumerable<IProperty, ContentPropertyDto>(source.Properties);
         }
 
         // Umbraco.Code.MapAll -AllowPreview -Errors -PersistedContent
@@ -99,7 +99,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Variants = _contentVariantMapper.Map(source, context);
 
             target.ContentDto = new ContentPropertyCollectionDto();
-            target.ContentDto.Properties = context.MapEnumerable<Property, ContentPropertyDto>(source.Properties);
+            target.ContentDto.Properties = context.MapEnumerable<IProperty, ContentPropertyDto>(source.Properties);
         }
 
         // Umbraco.Code.MapAll -Segment -Language
@@ -129,7 +129,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Owner = _commonMapper.GetOwner(source, context);
             target.ParentId = source.ParentId;
             target.Path = source.Path;
-            target.Properties = context.MapEnumerable<Property, ContentPropertyBasic>(source.Properties);
+            target.Properties = context.MapEnumerable<IProperty, ContentPropertyBasic>(source.Properties);
             target.SortOrder = source.SortOrder;
             target.State = _basicStateMapper.Map(source, context);
             target.Trashed = source.Trashed;
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
index 36c1b360b2..cddcfc6d1c 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
@@ -33,7 +33,7 @@ namespace Umbraco.Web.Models.Mapping
         /// Assigns the PropertyEditor, Id, Alias and Value to the property
         /// </summary>
         /// <returns></returns>
-        public virtual void Map(Property property, TDestination dest, MapperContext context)
+        public virtual void Map(IProperty property, TDestination dest, MapperContext context)
         {
             var editor = _propertyEditors[property.PropertyType.PropertyEditorAlias];
             if (editor == null)
@@ -71,7 +71,7 @@ namespace Umbraco.Web.Models.Mapping
             dest.Culture = culture;
 
             // if no 'IncludeProperties' were specified or this property is set to be included - we will map the value and return.
-            dest.Value = editor.GetValueEditor().ToEditor(property, DataTypeService, culture);
+            dest.Value = editor.GetValueEditor().ToEditor(property, culture);
         }
     }
 }
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayMapper.cs
index f68c5d8b44..12278e97ea 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayMapper.cs
@@ -19,7 +19,7 @@ namespace Umbraco.Web.Models.Mapping
         {
             _textService = textService;
         }
-        public override void Map(Property originalProp, ContentPropertyDisplay dest, MapperContext context)
+        public override void Map(IProperty originalProp, ContentPropertyDisplay dest, MapperContext context)
         {
             base.Map(originalProp, dest, context);
 
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoMapper.cs
index 72107c6201..f481ad445c 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyDtoMapper.cs
@@ -16,7 +16,7 @@ namespace Umbraco.Web.Models.Mapping
             : base(dataTypeService, entityService, logger, propertyEditors)
         { }
 
-        public override void Map(Property property, ContentPropertyDto dest, MapperContext context)
+        public override void Map(IProperty property, ContentPropertyDto dest, MapperContext context)
         {
             base.Map(property, dest, context);
 
diff --git a/src/Umbraco.Web/Models/Mapping/ContentPropertyMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/ContentPropertyMapDefinition.cs
index e6290cc19e..5d659fbf9e 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentPropertyMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentPropertyMapDefinition.cs
@@ -27,9 +27,9 @@ namespace Umbraco.Web.Models.Mapping
         public void DefineMaps(UmbracoMapper mapper)
         {
             mapper.Define<PropertyGroup, Tab<ContentPropertyDisplay>>((source, context) => new Tab<ContentPropertyDisplay>(), Map);
-            mapper.Define<Property, ContentPropertyBasic>((source, context) => new ContentPropertyBasic(), Map);
-            mapper.Define<Property, ContentPropertyDto>((source, context) => new ContentPropertyDto(), Map);
-            mapper.Define<Property, ContentPropertyDisplay>((source, context) => new ContentPropertyDisplay(), Map);
+            mapper.Define<IProperty, ContentPropertyBasic>((source, context) => new ContentPropertyBasic(), Map);
+            mapper.Define<IProperty, ContentPropertyDto>((source, context) => new ContentPropertyDto(), Map);
+            mapper.Define<IProperty, ContentPropertyDisplay>((source, context) => new ContentPropertyDisplay(), Map);
         }
 
         // Umbraco.Code.MapAll -Properties -Alias -Expanded
@@ -40,19 +40,19 @@ namespace Umbraco.Web.Models.Mapping
             target.Label = source.Name;
 }
 
-        private void Map(Property source, ContentPropertyBasic target, MapperContext context)
+        private void Map(IProperty source, ContentPropertyBasic target, MapperContext context)
         {
             // assume this is mapping everything and no MapAll is required
             _contentPropertyBasicConverter.Map(source, target, context);
         }
 
-        private void Map(Property source, ContentPropertyDto target, MapperContext context)
+        private void Map(IProperty source, ContentPropertyDto target, MapperContext context)
         {
             // assume this is mapping everything and no MapAll is required
             _contentPropertyDtoConverter.Map(source, target, context);
         }
 
-        private void Map(Property source, ContentPropertyDisplay target, MapperContext context)
+        private void Map(IProperty source, ContentPropertyDisplay target, MapperContext context)
         {
             // assume this is mapping everything and no MapAll is required
             _contentPropertyDisplayMapper.Map(source, target, context);
diff --git a/src/Umbraco.Web/Models/Mapping/MediaMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/MediaMapDefinition.cs
index 05c006ec41..80bdc7ade4 100644
--- a/src/Umbraco.Web/Models/Mapping/MediaMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/MediaMapDefinition.cs
@@ -42,7 +42,7 @@ namespace Umbraco.Web.Models.Mapping
         // Umbraco.Code.MapAll
         private static void Map(IMedia source, ContentPropertyCollectionDto target, MapperContext context)
         {
-            target.Properties = context.MapEnumerable<Property, ContentPropertyDto>(source.Properties);
+            target.Properties = context.MapEnumerable<IProperty, ContentPropertyDto>(source.Properties);
         }
 
         // Umbraco.Code.MapAll -Properties -Errors -Edited -Updater -Alias -IsContainer
@@ -86,7 +86,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Owner = _commonMapper.GetOwner(source, context);
             target.ParentId = source.ParentId;
             target.Path = source.Path;
-            target.Properties = context.MapEnumerable<Property, ContentPropertyBasic>(source.Properties);
+            target.Properties = context.MapEnumerable<IProperty, ContentPropertyBasic>(source.Properties);
             target.SortOrder = source.SortOrder;
             target.State = null;
             target.Trashed = source.Trashed;
diff --git a/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs
index 8671bfe538..fd295803c1 100644
--- a/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs
+++ b/src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs
@@ -113,7 +113,7 @@ namespace Umbraco.Web.Models.Mapping
             target.Owner = _commonMapper.GetOwner(source, context);
             target.ParentId = source.ParentId;
             target.Path = source.Path;
-            target.Properties = context.MapEnumerable<Property, ContentPropertyBasic>(source.Properties);
+            target.Properties = context.MapEnumerable<IProperty, ContentPropertyBasic>(source.Properties);
             target.SortOrder = source.SortOrder;
             target.State = null;
             target.Udi = Udi.Create(Constants.UdiEntityType.Member, source.Key);
@@ -151,7 +151,7 @@ namespace Umbraco.Web.Models.Mapping
         // Umbraco.Code.MapAll
         private static void Map(IMember source, ContentPropertyCollectionDto target, MapperContext context)
         {
-            target.Properties = context.MapEnumerable<Property, ContentPropertyDto>(source.Properties);
+            target.Properties = context.MapEnumerable<IProperty, ContentPropertyDto>(source.Properties);
         }
 
         private MembershipScenario GetMembershipScenario()
diff --git a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesMapper.cs b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesMapper.cs
index 8744b068a7..81d75de498 100644
--- a/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/MemberTabsAndPropertiesMapper.cs
@@ -176,7 +176,7 @@ namespace Umbraco.Web.Models.Mapping
         /// <param name="properties"></param>
         /// <param name="context"></param>
         /// <returns></returns>
-        protected override List<ContentPropertyDisplay> MapProperties(IContentBase content, List<Property> properties, MapperContext context)
+        protected override List<ContentPropertyDisplay> MapProperties(IContentBase content, List<IProperty> properties, MapperContext context)
         {
             var result = base.MapProperties(content, properties, context);
             var member = (IMember)content;
diff --git a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesMapper.cs b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesMapper.cs
index b8d76572fb..70a001735a 100644
--- a/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/TabsAndPropertiesMapper.cs
@@ -103,9 +103,9 @@ namespace Umbraco.Web.Models.Mapping
         /// <param name="properties"></param>
         /// <param name="context"></param>
         /// <returns></returns>
-        protected virtual List<ContentPropertyDisplay> MapProperties(IContentBase content, List<Property> properties, MapperContext context)
+        protected virtual List<ContentPropertyDisplay> MapProperties(IContentBase content, List<IProperty> properties, MapperContext context)
         {
-            return context.MapEnumerable<Property, ContentPropertyDisplay>(properties.OrderBy(x => x.PropertyType.SortOrder));
+            return context.MapEnumerable<IProperty, ContentPropertyDisplay>(properties.OrderBy(x => x.PropertyType.SortOrder));
         }
     }
 
@@ -132,7 +132,7 @@ namespace Umbraco.Web.Models.Mapping
             var groupsGroupsByName = contentType.CompositionPropertyGroups.OrderBy(x => x.SortOrder).GroupBy(x => x.Name);
             foreach (var groupsByName in groupsGroupsByName)
             {
-                var properties = new List<Property>();
+                var properties = new List<IProperty>();
 
                 // merge properties for groups with the same name
                 foreach (var group in groupsByName)
diff --git a/src/Umbraco.Web/PropertyEditors/CheckBoxListPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/CheckBoxListPropertyEditor.cs
index d81b63f2ad..f28acd5e90 100644
--- a/src/Umbraco.Web/PropertyEditors/CheckBoxListPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/CheckBoxListPropertyEditor.cs
@@ -17,20 +17,24 @@ namespace Umbraco.Web.PropertyEditors
     public class CheckBoxListPropertyEditor : DataEditor
     {
         private readonly ILocalizedTextService _textService;
+        private readonly IDataTypeService _dataTypeService;
+        private readonly ILocalizationService _localizationService;
 
         /// <summary>
         /// The constructor will setup the property editor based on the attribute if one is found
         /// </summary>
-        public CheckBoxListPropertyEditor(ILogger logger, ILocalizedTextService textService)
+        public CheckBoxListPropertyEditor(ILogger logger, ILocalizedTextService textService, IDataTypeService dataTypeService, ILocalizationService localizationService)
             : base(logger)
         {
             _textService = textService;
+            _dataTypeService = dataTypeService;
+            _localizationService = localizationService;
         }
 
         /// <inheritdoc />
         protected override IConfigurationEditor CreateConfigurationEditor() => new ValueListConfigurationEditor(_textService);
 
         /// <inheritdoc />
-        protected override IDataValueEditor CreateValueEditor() => new MultipleValueEditor(Logger, Attribute);
+        protected override IDataValueEditor CreateValueEditor() => new MultipleValueEditor(Logger, _dataTypeService, _localizationService, Attribute);
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/DateValueEditor.cs b/src/Umbraco.Web/PropertyEditors/DateValueEditor.cs
index a03ad4aa00..b8dada173f 100644
--- a/src/Umbraco.Web/PropertyEditors/DateValueEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/DateValueEditor.cs
@@ -12,13 +12,13 @@ namespace Umbraco.Web.PropertyEditors
     /// </summary>
     internal class DateValueEditor : DataValueEditor
     {
-        public DateValueEditor(DataEditorAttribute attribute)
-            : base(attribute)
+        public DateValueEditor(IDataTypeService dataTypeService, ILocalizationService localizationService, DataEditorAttribute attribute)
+            : base(dataTypeService, localizationService, attribute)
         {
             Validators.Add(new DateTimeValidator());
         }
 
-        public override object ToEditor(Property property, IDataTypeService dataTypeService, string culture= null, string segment = null)
+        public override object ToEditor(IProperty property, string culture= null, string segment = null)
         {
             var date = property.GetValue(culture, segment).TryConvertTo<DateTime?>();
             if (date.Success == false || date.Result == null)
diff --git a/src/Umbraco.Web/PropertyEditors/DropDownFlexiblePropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/DropDownFlexiblePropertyEditor.cs
index 98a19f39ad..0b0a0f6d06 100644
--- a/src/Umbraco.Web/PropertyEditors/DropDownFlexiblePropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/DropDownFlexiblePropertyEditor.cs
@@ -14,16 +14,20 @@ namespace Umbraco.Web.PropertyEditors
     public class DropDownFlexiblePropertyEditor : DataEditor
     {
         private readonly ILocalizedTextService _textService;
+        private readonly IDataTypeService _dataTypeService;
+        private readonly ILocalizationService _localizationService;
 
-        public DropDownFlexiblePropertyEditor(ILocalizedTextService textService, ILogger logger)
+        public DropDownFlexiblePropertyEditor(ILocalizedTextService textService, ILogger logger, IDataTypeService dataTypeService, ILocalizationService localizationService)
             : base(logger)
         {
             _textService = textService;
+            _dataTypeService = dataTypeService;
+            _localizationService = localizationService;
         }
 
         protected override IDataValueEditor CreateValueEditor()
         {
-            return new MultipleValueEditor(Logger, Attribute);
+            return new MultipleValueEditor(Logger, _dataTypeService, _localizationService, Attribute);
         }
 
         protected override IConfigurationEditor CreateConfigurationEditor() => new DropDownFlexibleConfigurationEditor(_textService);
diff --git a/src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
index a3396a5fb3..366f3938a6 100644
--- a/src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
@@ -8,6 +8,7 @@ using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
+using Umbraco.Core.Services.Implement;
 using Umbraco.Web.Media;
 
 namespace Umbraco.Web.PropertyEditors
@@ -23,12 +24,16 @@ namespace Umbraco.Web.PropertyEditors
         private readonly IMediaFileSystem _mediaFileSystem;
         private readonly IContentSection _contentSection;
         private readonly UploadAutoFillProperties _uploadAutoFillProperties;
+        private readonly IDataTypeService _dataTypeService;
+        private readonly ILocalizationService _localizationService;
 
-        public FileUploadPropertyEditor(ILogger logger, IMediaFileSystem mediaFileSystem, IContentSection contentSection)
+        public FileUploadPropertyEditor(ILogger logger, IMediaFileSystem mediaFileSystem, IContentSection contentSection, IDataTypeService dataTypeService, ILocalizationService localizationService)
             : base(logger)
         {
             _mediaFileSystem = mediaFileSystem ?? throw new ArgumentNullException(nameof(mediaFileSystem));
             _contentSection = contentSection;
+            _dataTypeService = dataTypeService;
+            _localizationService = localizationService;
             _uploadAutoFillProperties = new UploadAutoFillProperties(_mediaFileSystem, logger, contentSection);
         }
 
@@ -38,7 +43,7 @@ namespace Umbraco.Web.PropertyEditors
         /// <returns>The corresponding property value editor.</returns>
         protected override IDataValueEditor CreateValueEditor()
         {
-            var editor = new FileUploadPropertyValueEditor(Attribute, _mediaFileSystem);
+            var editor = new FileUploadPropertyValueEditor(Attribute, _mediaFileSystem, _dataTypeService, _localizationService);
             editor.Validators.Add(new UploadFileTypeValidator());
             return editor;
         }
@@ -48,7 +53,7 @@ namespace Umbraco.Web.PropertyEditors
         /// </summary>
         /// <param name="property">The property.</param>
         /// <returns>A value indicating whether a property is an upload field, and (optionally) has a non-empty value.</returns>
-        private static bool IsUploadField(Property property)
+        private static bool IsUploadField(IProperty property)
         {
             return property.PropertyType.PropertyEditorAlias == Constants.PropertyEditors.Aliases.UploadField;
         }
@@ -70,7 +75,7 @@ namespace Umbraco.Web.PropertyEditors
         /// </summary>
         /// <param name="prop"></param>
         /// <returns></returns>
-        private IEnumerable<string> GetFilePathsFromPropertyValues(Property prop)
+        private IEnumerable<string> GetFilePathsFromPropertyValues(IProperty prop)
         {
             var propVals = prop.Values;
             foreach (var propertyValue in propVals)
diff --git a/src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs b/src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs
index 942f53b561..172d8070af 100644
--- a/src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs
@@ -7,6 +7,7 @@ using Umbraco.Core;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models.Editors;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Web.PropertyEditors
 {
@@ -17,8 +18,8 @@ namespace Umbraco.Web.PropertyEditors
     {
         private readonly IMediaFileSystem _mediaFileSystem;
 
-        public FileUploadPropertyValueEditor(DataEditorAttribute attribute, IMediaFileSystem mediaFileSystem)
-            : base(attribute)
+        public FileUploadPropertyValueEditor(DataEditorAttribute attribute, IMediaFileSystem mediaFileSystem, IDataTypeService dataTypeService, ILocalizationService localizationService)
+            : base(dataTypeService, localizationService, attribute)
         {
             _mediaFileSystem = mediaFileSystem ?? throw new ArgumentNullException(nameof(mediaFileSystem));
         }
@@ -92,7 +93,7 @@ namespace Umbraco.Web.PropertyEditors
             if (editorFile == null) return null;
             return filepath == null ? string.Empty : _mediaFileSystem.GetUrl(filepath);
 
-            
+
         }
 
         private string ProcessFile(ContentPropertyData editorValue, ContentPropertyFile file, string currentPath, Guid cuid, Guid puid)
diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
index 24e2fc29a5..6f6f1d911d 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
@@ -28,14 +28,18 @@ namespace Umbraco.Web.PropertyEditors
         private IMediaService _mediaService;
         private IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
         private IUmbracoContextAccessor _umbracoContextAccessor;
+        private readonly IDataTypeService _dataTypeService;
+        private readonly ILocalizationService _localizationService;
         private ILogger _logger;
 
-        public GridPropertyEditor(ILogger logger, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, IUmbracoContextAccessor umbracoContextAccessor)
+        public GridPropertyEditor(ILogger logger, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, IUmbracoContextAccessor umbracoContextAccessor, IDataTypeService dataTypeService, ILocalizationService localizationService)
             : base(logger)
         {
             _mediaService = mediaService;
             _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
             _umbracoContextAccessor = umbracoContextAccessor;
+            _dataTypeService = dataTypeService;
+            _localizationService = localizationService;
             _logger = logger;
         }
 
@@ -45,7 +49,7 @@ namespace Umbraco.Web.PropertyEditors
         /// Overridden to ensure that the value is validated
         /// </summary>
         /// <returns></returns>
-        protected override IDataValueEditor CreateValueEditor() => new GridPropertyValueEditor(Attribute, _mediaService, _contentTypeBaseServiceProvider, _umbracoContextAccessor, _logger);
+        protected override IDataValueEditor CreateValueEditor() => new GridPropertyValueEditor(Attribute, _mediaService, _contentTypeBaseServiceProvider, _umbracoContextAccessor, _logger, _dataTypeService, _localizationService);
 
         protected override IConfigurationEditor CreateConfigurationEditor() => new GridConfigurationEditor();
 
@@ -56,8 +60,8 @@ namespace Umbraco.Web.PropertyEditors
             private IUmbracoContextAccessor _umbracoContextAccessor;
             private ILogger _logger;
 
-            public GridPropertyValueEditor(DataEditorAttribute attribute, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, IUmbracoContextAccessor umbracoContextAccessor, ILogger logger)
-                : base(attribute)
+            public GridPropertyValueEditor(DataEditorAttribute attribute, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, IUmbracoContextAccessor umbracoContextAccessor, ILogger logger, IDataTypeService dataTypeService, ILocalizationService localizationService)
+                : base(dataTypeService, localizationService, attribute)
             {
                 _mediaService = mediaService;
                 _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
@@ -115,7 +119,7 @@ namespace Umbraco.Web.PropertyEditors
             /// <param name="culture"></param>
             /// <param name="segment"></param>
             /// <returns></returns>
-            public override object ToEditor(Property property, IDataTypeService dataTypeService, string culture = null, string segment = null)
+            public override object ToEditor(IProperty property, string culture = null, string segment = null)
             {
                 var val = property.GetValue(culture, segment);
                 if (val == null) return string.Empty;
diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs
index 0cf36122d7..af72f0b819 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyIndexValueFactory.cs
@@ -18,7 +18,7 @@ namespace Umbraco.Web.PropertyEditors
     /// </summary>
     public class GridPropertyIndexValueFactory : IPropertyIndexValueFactory
     {
-        public IEnumerable<KeyValuePair<string, IEnumerable<object>>> GetIndexValues(Property property, string culture, string segment, bool published)
+        public IEnumerable<KeyValuePair<string, IEnumerable<object>>> GetIndexValues(IProperty property, string culture, string segment, bool published)
         {
             var result = new List<KeyValuePair<string, IEnumerable<object>>>();
 
diff --git a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
index 1d7c1eef65..fe1f026417 100644
--- a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
@@ -32,17 +32,19 @@ namespace Umbraco.Web.PropertyEditors
         private readonly IMediaFileSystem _mediaFileSystem;
         private readonly IContentSection _contentSettings;
         private readonly IDataTypeService _dataTypeService;
+        private readonly ILocalizationService _localizationService;
         private readonly UploadAutoFillProperties _autoFillProperties;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageCropperPropertyEditor"/> class.
         /// </summary>
-        public ImageCropperPropertyEditor(ILogger logger, IMediaFileSystem mediaFileSystem, IContentSection contentSettings, IDataTypeService dataTypeService)
+        public ImageCropperPropertyEditor(ILogger logger, IMediaFileSystem mediaFileSystem, IContentSection contentSettings, IDataTypeService dataTypeService, ILocalizationService localizationService)
             : base(logger)
         {
             _mediaFileSystem = mediaFileSystem ?? throw new ArgumentNullException(nameof(mediaFileSystem));
             _contentSettings = contentSettings ?? throw new ArgumentNullException(nameof(contentSettings));
             _dataTypeService = dataTypeService;
+            _localizationService = localizationService;
 
             // TODO: inject?
             _autoFillProperties = new UploadAutoFillProperties(_mediaFileSystem, logger, _contentSettings);
@@ -52,7 +54,7 @@ namespace Umbraco.Web.PropertyEditors
         /// Creates the corresponding property value editor.
         /// </summary>
         /// <returns>The corresponding property value editor.</returns>
-        protected override IDataValueEditor CreateValueEditor() => new ImageCropperPropertyValueEditor(Attribute, Logger, _mediaFileSystem);
+        protected override IDataValueEditor CreateValueEditor() => new ImageCropperPropertyValueEditor(Attribute, Logger, _mediaFileSystem, _dataTypeService, _localizationService);
 
         /// <summary>
         /// Creates the corresponding preValue editor.
@@ -65,7 +67,7 @@ namespace Umbraco.Web.PropertyEditors
         /// </summary>
         /// <param name="property">The property.</param>
         /// <returns>A value indicating whether a property is an image cropper field, and (optionally) has a non-empty value.</returns>
-        private static bool IsCropperField(Property property)
+        private static bool IsCropperField(IProperty property)
         {
             return property.PropertyType.PropertyEditorAlias == Constants.PropertyEditors.Aliases.ImageCropper;
         }
@@ -111,7 +113,7 @@ namespace Umbraco.Web.PropertyEditors
         /// </summary>
         /// <param name="prop"></param>
         /// <returns></returns>
-        private IEnumerable<string> GetFilePathsFromPropertyValues(Property prop)
+        private IEnumerable<string> GetFilePathsFromPropertyValues(IProperty prop)
         {
             //parses out the src from a json string
 
diff --git a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
index 4aac8f54aa..99e2f8c727 100644
--- a/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
@@ -21,8 +21,8 @@ namespace Umbraco.Web.PropertyEditors
         private readonly ILogger _logger;
         private readonly IMediaFileSystem _mediaFileSystem;
 
-        public ImageCropperPropertyValueEditor(DataEditorAttribute attribute, ILogger logger, IMediaFileSystem mediaFileSystem)
-            : base(attribute)
+        public ImageCropperPropertyValueEditor(DataEditorAttribute attribute, ILogger logger, IMediaFileSystem mediaFileSystem, IDataTypeService dataTypeService, ILocalizationService localizationService)
+            : base(dataTypeService, localizationService, attribute)
         {
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _mediaFileSystem = mediaFileSystem ?? throw new ArgumentNullException(nameof(mediaFileSystem));
@@ -32,7 +32,7 @@ namespace Umbraco.Web.PropertyEditors
         /// This is called to merge in the prevalue crops with the value that is saved - similar to the property value converter for the front-end
         /// </summary>
 
-        public override object ToEditor(Property property, IDataTypeService dataTypeService, string culture = null, string segment = null)
+        public override object ToEditor(IProperty property, string culture = null, string segment = null)
         {
             var val = property.GetValue(culture, segment);
             if (val == null) return null;
@@ -47,7 +47,7 @@ namespace Umbraco.Web.PropertyEditors
                 value = new ImageCropperValue { Src = val.ToString() };
             }
 
-            var dataType = dataTypeService.GetDataType(property.PropertyType.DataTypeId);
+            var dataType = _dataTypeService.GetDataType(property.PropertyType.DataTypeId);
             if (dataType?.Configuration != null)
                 value.ApplyConfiguration(dataType.ConfigurationAs<ImageCropperConfiguration>());
 
@@ -161,7 +161,7 @@ namespace Umbraco.Web.PropertyEditors
         }
 
 
-        public override string ConvertDbToString(PropertyType propertyType, object value, IDataTypeService dataTypeService)
+        public override string ConvertDbToString(IPropertyType propertyType, object value)
         {
             if (value == null || string.IsNullOrEmpty(value.ToString()))
                 return null;
@@ -172,7 +172,7 @@ namespace Umbraco.Web.PropertyEditors
                 return val;
 
             // more magic here ;-(
-            var configuration = dataTypeService.GetDataType(propertyType.DataTypeId).ConfigurationAs<ImageCropperConfiguration>();
+            var configuration = _dataTypeService.GetDataType(propertyType.DataTypeId).ConfigurationAs<ImageCropperConfiguration>();
             var crops = configuration?.Crops ?? Array.Empty<ImageCropperConfiguration.Crop>();
 
             return JsonConvert.SerializeObject(new
diff --git a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
index 95ac809576..a5da833501 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
@@ -19,15 +19,19 @@ namespace Umbraco.Web.PropertyEditors
     {
         private readonly IEntityService _entityService;
         private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
+        private readonly IDataTypeService _dataTypeService;
+        private readonly ILocalizationService _localizationService;
 
-        public MultiUrlPickerPropertyEditor(ILogger logger, IEntityService entityService, IPublishedSnapshotAccessor publishedSnapshotAccessor) : base(logger, EditorType.PropertyValue)
+        public MultiUrlPickerPropertyEditor(ILogger logger, IEntityService entityService, IPublishedSnapshotAccessor publishedSnapshotAccessor, IDataTypeService dataTypeService, ILocalizationService localizationService) : base(logger, EditorType.PropertyValue)
         {
             _entityService = entityService ?? throw new ArgumentNullException(nameof(entityService));
             _publishedSnapshotAccessor = publishedSnapshotAccessor ?? throw new ArgumentNullException(nameof(publishedSnapshotAccessor));
+            _dataTypeService = dataTypeService;
+            _localizationService = localizationService;
         }
 
         protected override IConfigurationEditor CreateConfigurationEditor() => new MultiUrlPickerConfigurationEditor();
 
-        protected override IDataValueEditor CreateValueEditor() => new MultiUrlPickerValueEditor(_entityService, _publishedSnapshotAccessor, Logger, Attribute);
+        protected override IDataValueEditor CreateValueEditor() => new MultiUrlPickerValueEditor(_entityService, _publishedSnapshotAccessor, Logger, _dataTypeService, _localizationService, Attribute);
     }
 }
diff --git a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs
index aa8fa73c7a..97d787dbba 100644
--- a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs
@@ -21,14 +21,14 @@ namespace Umbraco.Web.PropertyEditors
         private readonly ILogger _logger;
         private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
 
-        public MultiUrlPickerValueEditor(IEntityService entityService, IPublishedSnapshotAccessor publishedSnapshotAccessor, ILogger logger, DataEditorAttribute attribute) : base(attribute)
+        public MultiUrlPickerValueEditor(IEntityService entityService, IPublishedSnapshotAccessor publishedSnapshotAccessor, ILogger logger, IDataTypeService dataTypeService, ILocalizationService localizationService, DataEditorAttribute attribute) : base(dataTypeService, localizationService, attribute)
         {
             _entityService = entityService ?? throw new ArgumentNullException(nameof(entityService));
             _publishedSnapshotAccessor = publishedSnapshotAccessor ?? throw new ArgumentNullException(nameof(publishedSnapshotAccessor));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
         }
 
-        public override object ToEditor(Property property, IDataTypeService dataTypeService, string culture = null, string segment = null)
+        public override object ToEditor(IProperty property, string culture = null, string segment = null)
         {
             var value = property.GetValue(culture, segment)?.ToString();
 
@@ -118,7 +118,7 @@ namespace Umbraco.Web.PropertyEditors
                 _logger.Error<MultiUrlPickerValueEditor>("Error getting links", ex);
             }
 
-            return base.ToEditor(property, dataTypeService, culture, segment);
+            return base.ToEditor(property, culture, segment);
         }
 
 
diff --git a/src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs
index fa82bc555c..29ec8530d9 100644
--- a/src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultipleTextStringPropertyEditor.cs
@@ -4,6 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Newtonsoft.Json.Linq;
 using Umbraco.Core;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
@@ -34,7 +35,7 @@ namespace Umbraco.Web.PropertyEditors
         { }
 
         /// <inheritdoc />
-        protected override IDataValueEditor CreateValueEditor() => new MultipleTextStringPropertyValueEditor(Attribute);
+        protected override IDataValueEditor CreateValueEditor() => new MultipleTextStringPropertyValueEditor(Current.Services.DataTypeService, Current.Services.LocalizationService,Attribute);
 
         /// <inheritdoc />
         protected override IConfigurationEditor CreateConfigurationEditor() => new MultipleTextStringConfigurationEditor();
@@ -44,8 +45,8 @@ namespace Umbraco.Web.PropertyEditors
         /// </summary>
         internal class MultipleTextStringPropertyValueEditor : DataValueEditor
         {
-            public MultipleTextStringPropertyValueEditor(DataEditorAttribute attribute)
-                : base(attribute)
+            public MultipleTextStringPropertyValueEditor(IDataTypeService dataTypeService, ILocalizationService localizationService, DataEditorAttribute attribute)
+                : base(dataTypeService, localizationService, attribute)
             { }
 
             /// <summary>
@@ -95,7 +96,7 @@ namespace Umbraco.Web.PropertyEditors
             /// <remarks>
             /// The legacy property editor saved this data as new line delimited! strange but we have to maintain that.
             /// </remarks>
-            public override object ToEditor(Property property, IDataTypeService dataTypeService, string culture = null, string segment = null)
+            public override object ToEditor(IProperty property, string culture = null, string segment = null)
             {
                 var val = property.GetValue(culture, segment);
                 return val?.ToString().Split(new[] {Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries)
diff --git a/src/Umbraco.Web/PropertyEditors/MultipleValueEditor.cs b/src/Umbraco.Web/PropertyEditors/MultipleValueEditor.cs
index bbeaff184e..f5ca6c5cfe 100644
--- a/src/Umbraco.Web/PropertyEditors/MultipleValueEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MultipleValueEditor.cs
@@ -19,8 +19,8 @@ namespace Umbraco.Web.PropertyEditors
     {
         private readonly ILogger _logger;
 
-        internal MultipleValueEditor(ILogger logger, DataEditorAttribute attribute)
-            : base(attribute)
+        internal MultipleValueEditor(ILogger logger, IDataTypeService dataTypeService, ILocalizationService localizationService, DataEditorAttribute attribute)
+            : base(dataTypeService, localizationService, attribute)
         {
             _logger = logger;
         }
@@ -33,9 +33,9 @@ namespace Umbraco.Web.PropertyEditors
         /// <param name="culture"></param>
         /// <param name="segment"></param>
         /// <returns></returns>
-        public override object ToEditor(Property property, IDataTypeService dataTypeService, string culture = null, string segment = null)
+        public override object ToEditor(IProperty property, string culture = null, string segment = null)
         {
-            var json = base.ToEditor(property, dataTypeService, culture, segment).ToString();
+            var json = base.ToEditor(property, culture, segment).ToString();
             return JsonConvert.DeserializeObject<string[]>(json) ?? Array.Empty<string>();
         }
 
diff --git a/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
index f511a97cac..3c9dc53de7 100644
--- a/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
@@ -28,13 +28,17 @@ namespace Umbraco.Web.PropertyEditors
     public class NestedContentPropertyEditor : DataEditor
     {
         private readonly Lazy<PropertyEditorCollection> _propertyEditors;
+        private readonly IDataTypeService _dataTypeService;
+        private readonly ILocalizationService _localizationService;
 
         internal const string ContentTypeAliasPropertyKey = "ncContentTypeAlias";
 
-        public NestedContentPropertyEditor(ILogger logger, Lazy<PropertyEditorCollection> propertyEditors)
+        public NestedContentPropertyEditor(ILogger logger, Lazy<PropertyEditorCollection> propertyEditors, IDataTypeService dataTypeService, ILocalizationService localizationService)
             : base (logger)
         {
             _propertyEditors = propertyEditors;
+            _dataTypeService = dataTypeService;
+            _localizationService = localizationService;
         }
 
         // has to be lazy else circular dep in ctor
@@ -48,7 +52,7 @@ namespace Umbraco.Web.PropertyEditors
 
         #region Value Editor
 
-        protected override IDataValueEditor CreateValueEditor() => new NestedContentPropertyValueEditor(Attribute, PropertyEditors);
+        protected override IDataValueEditor CreateValueEditor() => new NestedContentPropertyValueEditor(_dataTypeService, _localizationService, Attribute, PropertyEditors);
 
         internal class NestedContentPropertyValueEditor : DataValueEditor
         {
@@ -58,8 +62,8 @@ namespace Umbraco.Web.PropertyEditors
                     Current.Services.ContentTypeService.GetAll().ToDictionary(c => c.Alias)
             );
 
-            public NestedContentPropertyValueEditor(DataEditorAttribute attribute, PropertyEditorCollection propertyEditors)
-                : base(attribute)
+            public NestedContentPropertyValueEditor(IDataTypeService dataTypeService, ILocalizationService localizationService, DataEditorAttribute attribute, PropertyEditorCollection propertyEditors)
+                : base(dataTypeService, localizationService, attribute)
             {
                 _propertyEditors = propertyEditors;
                 Validators.Add(new NestedContentValidator(propertyEditors, GetElementType));
@@ -92,7 +96,7 @@ namespace Umbraco.Web.PropertyEditors
 
             #region DB to String
 
-            public override string ConvertDbToString(PropertyType propertyType, object propertyValue, IDataTypeService dataTypeService)
+            public override string ConvertDbToString(IPropertyType propertyType, object propertyValue)
             {
                 if (propertyValue == null || string.IsNullOrWhiteSpace(propertyValue.ToString()))
                     return string.Empty;
@@ -129,9 +133,9 @@ namespace Umbraco.Web.PropertyEditors
                                 {
                                     continue;
                                 }
-                                var tempConfig = dataTypeService.GetDataType(propType.DataTypeId).Configuration;
+                                var tempConfig = _dataTypeService.GetDataType(propType.DataTypeId).Configuration;
                                 var valEditor = propEditor.GetValueEditor(tempConfig);
-                                var convValue = valEditor.ConvertDbToString(propType, propValues[propAlias]?.ToString(), dataTypeService);
+                                var convValue = valEditor.ConvertDbToString(propType, propValues[propAlias]?.ToString());
                                 propValues[propAlias] = convValue;
                             }
                             catch (InvalidOperationException)
@@ -152,7 +156,7 @@ namespace Umbraco.Web.PropertyEditors
 
             // note: there is NO variant support here
 
-            public override object ToEditor(Property property, IDataTypeService dataTypeService, string culture = null, string segment = null)
+            public override object ToEditor(IProperty property, string culture = null, string segment = null)
             {
                 var val = property.GetValue(culture, segment);
                 if (val == null || string.IsNullOrWhiteSpace(val.ToString()))
@@ -197,9 +201,9 @@ namespace Umbraco.Web.PropertyEditors
                                     propValues[propAlias] = tempProp.GetValue()?.ToString();
                                     continue;
                                 }
-                                var tempConfig = dataTypeService.GetDataType(propType.DataTypeId).Configuration;
+                                var tempConfig = _dataTypeService.GetDataType(propType.DataTypeId).Configuration;
                                 var valEditor = propEditor.GetValueEditor(tempConfig);
-                                var convValue = valEditor.ToEditor(tempProp, dataTypeService);
+                                var convValue = valEditor.ToEditor(tempProp);
                                 propValues[propAlias] = convValue == null ? null : JToken.FromObject(convValue);
                             }
                             catch (InvalidOperationException)
diff --git a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
index 5743e9c1d5..aa6876df39 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
@@ -27,16 +27,26 @@ namespace Umbraco.Web.PropertyEditors
         private IMediaService _mediaService;
         private IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
         private IUmbracoContextAccessor _umbracoContextAccessor;
+        private readonly IDataTypeService _dataTypeService;
+        private readonly ILocalizationService _localizationService;
         private ILogger _logger;
 
         /// <summary>
         /// The constructor will setup the property editor based on the attribute if one is found
         /// </summary>
-        public RichTextPropertyEditor(ILogger logger, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, IUmbracoContextAccessor umbracoContextAccessor) : base(logger)
+        public RichTextPropertyEditor(
+            ILogger logger,
+            IMediaService mediaService,
+            IContentTypeBaseServiceProvider contentTypeBaseServiceProvider,
+            IUmbracoContextAccessor umbracoContextAccessor,
+            IDataTypeService dataTypeService,
+            ILocalizationService localizationService) : base(logger)
         {
             _mediaService = mediaService;
             _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
             _umbracoContextAccessor = umbracoContextAccessor;
+            _dataTypeService = dataTypeService;
+            _localizationService = localizationService;
             _logger = logger;
         }
 
@@ -44,7 +54,7 @@ namespace Umbraco.Web.PropertyEditors
         /// Create a custom value editor
         /// </summary>
         /// <returns></returns>
-        protected override IDataValueEditor CreateValueEditor() => new RichTextPropertyValueEditor(Attribute, _mediaService, _contentTypeBaseServiceProvider, _umbracoContextAccessor, _logger);
+        protected override IDataValueEditor CreateValueEditor() => new RichTextPropertyValueEditor(Attribute, _mediaService, _contentTypeBaseServiceProvider, _umbracoContextAccessor, _logger, _dataTypeService, _localizationService);
 
         protected override IConfigurationEditor CreateConfigurationEditor() => new RichTextConfigurationEditor();
 
@@ -60,8 +70,8 @@ namespace Umbraco.Web.PropertyEditors
             private IUmbracoContextAccessor _umbracoContextAccessor;
             private ILogger _logger;
 
-            public RichTextPropertyValueEditor(DataEditorAttribute attribute, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, IUmbracoContextAccessor umbracoContextAccessor, ILogger logger)
-                : base(attribute)
+            public RichTextPropertyValueEditor(DataEditorAttribute attribute, IMediaService mediaService, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, IUmbracoContextAccessor umbracoContextAccessor, ILogger logger, IDataTypeService dataTypeService, ILocalizationService localizationService)
+                : base(dataTypeService, localizationService, attribute)
             {
                 _mediaService = mediaService;
                 _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
@@ -92,7 +102,7 @@ namespace Umbraco.Web.PropertyEditors
             /// <param name="dataTypeService"></param>
             /// <param name="culture"></param>
             /// <param name="segment"></param>
-            public override object ToEditor(Property property, IDataTypeService dataTypeService, string culture = null, string segment = null)
+            public override object ToEditor(IProperty property, string culture = null, string segment = null)
             {
                 var val = property.GetValue(culture, segment);
                 if (val == null)
@@ -130,7 +140,7 @@ namespace Umbraco.Web.PropertyEditors
 
         internal class RichTextPropertyIndexValueFactory : IPropertyIndexValueFactory
         {
-            public IEnumerable<KeyValuePair<string, IEnumerable<object>>> GetIndexValues(Property property, string culture, string segment, bool published)
+            public IEnumerable<KeyValuePair<string, IEnumerable<object>>> GetIndexValues(IProperty property, string culture, string segment, bool published)
             {
                 var val = property.GetValue(culture, segment, published);
 
diff --git a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
index fd7e8694a3..74338ba3fa 100644
--- a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
@@ -4,10 +4,12 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Newtonsoft.Json.Linq;
 using Umbraco.Core;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Editors;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Web.PropertyEditors
 {
@@ -30,14 +32,14 @@ namespace Umbraco.Web.PropertyEditors
             _validators = validators;
         }
 
-        protected override IDataValueEditor CreateValueEditor() => new TagPropertyValueEditor(Attribute);
+        protected override IDataValueEditor CreateValueEditor() => new TagPropertyValueEditor(Current.Services.DataTypeService, Current.Services.LocalizationService, Attribute);
 
         protected override IConfigurationEditor CreateConfigurationEditor() => new TagConfigurationEditor(_validators);
 
         internal class TagPropertyValueEditor : DataValueEditor
         {
-            public TagPropertyValueEditor(DataEditorAttribute attribute)
-                : base(attribute)
+            public TagPropertyValueEditor(IDataTypeService dataTypeService, ILocalizationService localizationService, DataEditorAttribute attribute)
+                : base(dataTypeService, localizationService, attribute)
             { }
 
             /// <inheritdoc />
diff --git a/src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs
index c7bc2efbda..28698e2c5c 100644
--- a/src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs
@@ -1,6 +1,7 @@
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Web.PropertyEditors
 {
@@ -16,15 +17,21 @@ namespace Umbraco.Web.PropertyEditors
         Icon = "icon-application-window-alt")]
     public class TextAreaPropertyEditor : DataEditor
     {
+        private readonly IDataTypeService _dataTypeService;
+        private readonly ILocalizationService _localizationService;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="TextAreaPropertyEditor"/> class.
         /// </summary>
-        public TextAreaPropertyEditor(ILogger logger)
+        public TextAreaPropertyEditor(ILogger logger, IDataTypeService dataTypeService, ILocalizationService localizationService)
             : base(logger)
-        { }
+        {
+            _dataTypeService = dataTypeService;
+            _localizationService = localizationService;
+        }
 
         /// <inheritdoc />
-        protected override IDataValueEditor CreateValueEditor() => new TextOnlyValueEditor(Attribute);
+        protected override IDataValueEditor CreateValueEditor() => new TextOnlyValueEditor(_dataTypeService, _localizationService, Attribute);
 
         /// <inheritdoc />
         protected override IConfigurationEditor CreateConfigurationEditor() => new TextAreaConfigurationEditor();
diff --git a/src/Umbraco.Web/PropertyEditors/TextOnlyValueEditor.cs b/src/Umbraco.Web/PropertyEditors/TextOnlyValueEditor.cs
index 754cef1f31..782e19e42d 100644
--- a/src/Umbraco.Web/PropertyEditors/TextOnlyValueEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/TextOnlyValueEditor.cs
@@ -11,8 +11,8 @@ namespace Umbraco.Web.PropertyEditors
     /// </summary>
     public class TextOnlyValueEditor : DataValueEditor
     {
-        public TextOnlyValueEditor(DataEditorAttribute attribute)
-            : base(attribute)
+        public TextOnlyValueEditor(IDataTypeService dataTypeService, ILocalizationService localizationService, DataEditorAttribute attribute)
+            : base(dataTypeService, localizationService, attribute)
         { }
 
         /// <summary>
@@ -26,7 +26,7 @@ namespace Umbraco.Web.PropertyEditors
         /// <remarks>
         /// The object returned will always be a string and if the database type is not a valid string type an exception is thrown
         /// </remarks>
-        public override object ToEditor(Property property, IDataTypeService dataTypeService, string culture = null, string segment = null)
+        public override object ToEditor(IProperty property, string culture = null, string segment = null)
         {
             var val = property.GetValue(culture, segment);
 
diff --git a/src/Umbraco.Web/PropertyEditors/TextboxPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/TextboxPropertyEditor.cs
index 18f8155198..c7c13b4caf 100644
--- a/src/Umbraco.Web/PropertyEditors/TextboxPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/TextboxPropertyEditor.cs
@@ -1,6 +1,7 @@
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Web.PropertyEditors
 {
@@ -15,15 +16,21 @@ namespace Umbraco.Web.PropertyEditors
         Group = Constants.PropertyEditors.Groups.Common)]
     public class TextboxPropertyEditor : DataEditor
     {
+        private readonly IDataTypeService _dataTypeService;
+        private readonly ILocalizationService _localizationService;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="TextboxPropertyEditor"/> class.
         /// </summary>
-        public TextboxPropertyEditor(ILogger logger)
+        public TextboxPropertyEditor(ILogger logger, IDataTypeService dataTypeService, ILocalizationService localizationService)
             : base(logger)
-        { }
+        {
+            _dataTypeService = dataTypeService;
+            _localizationService = localizationService;
+        }
 
         /// <inheritdoc/>
-        protected override IDataValueEditor CreateValueEditor() => new TextOnlyValueEditor(Attribute);
+        protected override IDataValueEditor CreateValueEditor() => new TextOnlyValueEditor(_dataTypeService, _localizationService, Attribute);
 
         /// <inheritdoc/>
         protected override IConfigurationEditor CreateConfigurationEditor() => new TextboxConfigurationEditor();
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
index bf4975714d..6d34a2af42 100644
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedContent.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Exceptions;
+using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Web.Composing;
 using Umbraco.Web.Models;
diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
index eae2f33979..554e76c665 100755
--- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
+++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
@@ -8,6 +8,7 @@ using CSharpTest.Net.Collections;
 using Newtonsoft.Json;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
@@ -46,6 +47,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private readonly IPublishedModelFactory _publishedModelFactory;
         private readonly IDefaultCultureAccessor _defaultCultureAccessor;
         private readonly UrlSegmentProviderCollection _urlSegmentProviders;
+        private readonly ITypeFinder _typeFinder;
 
         // volatile because we read it with no lock
         private volatile bool _isReady;
@@ -77,7 +79,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
             IDataSource dataSource, IGlobalSettings globalSettings,
             IEntityXmlSerializer entitySerializer,
             IPublishedModelFactory publishedModelFactory,
-            UrlSegmentProviderCollection urlSegmentProviders)
+            UrlSegmentProviderCollection urlSegmentProviders,
+            ITypeFinder typeFinder)
             : base(publishedSnapshotAccessor, variationContextAccessor)
         {
             //if (Interlocked.Increment(ref _singletonCheck) > 1)
@@ -94,6 +97,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             _defaultCultureAccessor = defaultCultureAccessor;
             _globalSettings = globalSettings;
             _urlSegmentProviders = urlSegmentProviders;
+            _typeFinder = typeFinder;
 
             // we need an Xml serializer here so that the member cache can support XPath,
             // for members this is done by navigating the serialized-to-xml member
@@ -1162,7 +1166,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
                     _contentGen = contentSnap.Gen;
                     _mediaGen = mediaSnap.Gen;
                     _domainGen = domainSnap.Gen;
-                    elementsCache = _elementsCache = new FastDictionaryAppCache();
+                    elementsCache = _elementsCache = new FastDictionaryAppCache(_typeFinder);
                 }
             }
 
diff --git a/src/Umbraco.Web/Runtime/WebRuntime.cs b/src/Umbraco.Web/Runtime/WebRuntime.cs
index ede500e599..ce420e88c6 100644
--- a/src/Umbraco.Web/Runtime/WebRuntime.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntime.cs
@@ -4,6 +4,8 @@ using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Runtime;
+using Umbraco.Web.Cache;
+using Umbraco.Web.Composing;
 using Umbraco.Web.Logging;
 
 namespace Umbraco.Web.Runtime
@@ -16,6 +18,7 @@ namespace Umbraco.Web.Runtime
     {
         private readonly UmbracoApplicationBase _umbracoApplication;
         private IProfiler _webProfiler;
+        private BuildManagerTypeFinder _typeFinder;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="WebRuntime"/> class.
@@ -56,18 +59,20 @@ namespace Umbraco.Web.Runtime
 
         #region Getters
 
+        protected override ITypeFinder GetTypeFinder() => _typeFinder ?? (_typeFinder = new BuildManagerTypeFinder(IOHelper, Logger, new BuildManagerTypeFinder.TypeFinderConfig()));
+
         protected override IProfiler GetProfiler() => _webProfiler;
 
         protected override AppCaches GetAppCaches() => new AppCaches(
                 // we need to have the dep clone runtime cache provider to ensure
                 // all entities are cached properly (cloned in and cloned out)
-                new DeepCloneAppCache(new WebCachingAppCache(HttpRuntime.Cache)),
+                new DeepCloneAppCache(new WebCachingAppCache(HttpRuntime.Cache, TypeFinder)),
                 // we need request based cache when running in web-based context
-                new HttpRequestAppCache(),
+                new HttpRequestAppCache(() => HttpContext.Current?.Items, TypeFinder),
                 new IsolatedCaches(type =>
                     // we need to have the dep clone runtime cache provider to ensure
                     // all entities are cached properly (cloned in and cloned out)
-                    new DeepCloneAppCache(new ObjectCacheAppCache())));
+                    new DeepCloneAppCache(new ObjectCacheAppCache(TypeFinder))));
 
         #endregion
     }
diff --git a/src/Umbraco.Web/Search/UmbracoIndexesCreator.cs b/src/Umbraco.Web/Search/UmbracoIndexesCreator.cs
index ec536b9d75..b9dbc7d996 100644
--- a/src/Umbraco.Web/Search/UmbracoIndexesCreator.cs
+++ b/src/Umbraco.Web/Search/UmbracoIndexesCreator.cs
@@ -7,6 +7,7 @@ using Lucene.Net.Analysis.Standard;
 using Examine.LuceneEngine;
 using Examine;
 using Umbraco.Core;
+using Umbraco.Core.Composing;
 
 namespace Umbraco.Web.Search
 {
@@ -17,10 +18,12 @@ namespace Umbraco.Web.Search
     {
         // TODO: we should inject the different IValueSetValidator so devs can just register them instead of overriding this class?
 
-        public UmbracoIndexesCreator(IProfilingLogger profilingLogger,
+        public UmbracoIndexesCreator(
+            ITypeFinder typeFinder,
+            IProfilingLogger profilingLogger,
             ILocalizationService languageService,
             IPublicAccessService publicAccessService,
-            IMemberService memberService, IUmbracoIndexConfig umbracoIndexConfig)
+            IMemberService memberService, IUmbracoIndexConfig umbracoIndexConfig) : base(typeFinder)
         {
             ProfilingLogger = profilingLogger ?? throw new System.ArgumentNullException(nameof(profilingLogger));
             LanguageService = languageService ?? throw new System.ArgumentNullException(nameof(languageService));
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 788a6dd737..048d8aacf2 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -41,7 +41,6 @@
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Design" />
@@ -135,9 +134,11 @@
     <Compile Include="Cache\IDistributedCacheBinder.cs" />
     <Compile Include="Cache\UserGroupCacheRefresher.cs" />
     <Compile Include="Cache\UserGroupPermissionsCacheRefresher.cs" />
+    <Compile Include="Cache\WebCachingAppCache.cs" />
     <Compile Include="Compose\BackOfficeUserAuditEventsComposer.cs" />
     <Compile Include="Compose\NotificationsComposer.cs" />
     <Compile Include="Compose\PublicAccessComposer.cs" />
+    <Compile Include="Composing\BuildManagerTypeFinder.cs" />
     <Compile Include="Composing\CompositionExtensions\Installer.cs" />
     <Compile Include="Composing\LightInject\LightInjectContainer.cs" />
     <Compile Include="Compose\BackOfficeUserAuditEventsComponent.cs" />
@@ -1286,4 +1287,4 @@
       <Output TaskParameter="SerializationAssembly" ItemName="SerializationAssembly" />
     </SGen>
   </Target>
-</Project>
\ No newline at end of file
+</Project>