diff --git a/src/Umbraco.Web/Trees/TreeController.cs b/src/Umbraco.Web/Trees/TreeController.cs
index a5f90fd2dc..75651603d7 100644
--- a/src/Umbraco.Web/Trees/TreeController.cs
+++ b/src/Umbraco.Web/Trees/TreeController.cs
@@ -1,238 +1,13 @@
 using System;
 using System.Collections.Concurrent;
-using System.Globalization;
 using System.Linq;
 using System.Net.Http.Formatting;
 using Umbraco.Core;
-using Umbraco.Core.Events;
 using Umbraco.Web.Models.Trees;
 using Umbraco.Web.Mvc;
-using Umbraco.Web.WebApi;
-using Umbraco.Web.WebApi.Filters;
-using Constants = Umbraco.Core.Constants;
 
 namespace Umbraco.Web.Trees
 {
-    /// <summary>
-    /// A base controller reference for non-attributed trees (un-registered). Developers should inherit from
-    /// TreeController.
-    /// </summary>
-    public abstract class TreeControllerBase : UmbracoAuthorizedApiController
-    {
-        /// <summary>
-        /// Remove the xml formatter... only support JSON!
-        /// </summary>
-        /// <param name="controllerContext"></param>
-        protected override void Initialize(global::System.Web.Http.Controllers.HttpControllerContext controllerContext)
-        {
-            base.Initialize(controllerContext);
-            controllerContext.Configuration.Formatters.Remove(controllerContext.Configuration.Formatters.XmlFormatter);
-        }
-
-        /// <summary>
-        /// The method called to render the contents of the tree structure
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="queryStrings">
-        /// All of the query string parameters passed from jsTree
-        /// </param>
-        /// <remarks>
-        /// We are allowing an arbitrary number of query strings to be pased in so that developers are able to persist custom data from the front-end
-        /// to the back end to be used in the query for model data.
-        /// </remarks>
-        protected abstract TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings);
-
-        /// <summary>
-        /// Returns the menu structure for the node
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="queryStrings"></param>
-        /// <returns></returns>
-        protected abstract MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings);
-
-        /// <summary>
-        /// The name to display on the root node
-        /// </summary>
-        public abstract string RootNodeDisplayName { get; }
-
-        /// <summary>
-        /// Gets the current tree alias from the attribute assigned to it.
-        /// </summary>
-        public abstract string TreeAlias { get; }
-
-        /// <summary>
-        /// Returns the root node for the tree
-        /// </summary>
-        /// <param name="queryStrings"></param>
-        /// <returns></returns>
-        [HttpQueryStringFilter("queryStrings")]
-        public TreeNode GetRootNode(FormDataCollection queryStrings)
-        {
-            if (queryStrings == null) queryStrings = new FormDataCollection("");
-            var node = CreateRootNode(queryStrings);
-
-            //add the tree alias to the root
-            node.AdditionalData["treeAlias"] = TreeAlias;
-
-            AddQueryStringsToAdditionalData(node, queryStrings);
-
-            //check if the tree is searchable and add that to the meta data as well
-            if (this is ISearchableTree)
-            {
-                node.AdditionalData.Add("searchable", "true");
-            }
-
-            //now update all data based on some of the query strings, like if we are running in dialog mode           
-            if (IsDialog(queryStrings))
-            {
-                node.RoutePath = "#";
-            }
-
-            OnRootNodeRendering(this, new TreeNodeRenderingEventArgs(node, queryStrings));
-
-            return node;
-        }
-
-        /// <summary>
-        /// The action called to render the contents of the tree structure
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="queryStrings">
-        /// All of the query string parameters passed from jsTree
-        /// </param>
-        /// <returns>JSON markup for jsTree</returns>        
-        /// <remarks>
-        /// We are allowing an arbitrary number of query strings to be pased in so that developers are able to persist custom data from the front-end
-        /// to the back end to be used in the query for model data.
-        /// </remarks>
-        [HttpQueryStringFilter("queryStrings")]
-        public TreeNodeCollection GetNodes(string id, FormDataCollection queryStrings)
-        {
-            if (queryStrings == null) queryStrings = new FormDataCollection("");
-            var nodes = GetTreeNodes(id, queryStrings);
-
-            foreach (var node in nodes)
-            {
-                AddQueryStringsToAdditionalData(node, queryStrings);
-            }
-
-            //now update all data based on some of the query strings, like if we are running in dialog mode            
-            if (IsDialog((queryStrings)))
-            {
-                foreach (var node in nodes)
-                {
-                    node.RoutePath = "#";    
-                }
-            }
-
-            //raise the event
-            OnTreeNodesRendering(this, new TreeNodesRenderingEventArgs(nodes, queryStrings));
-
-            return nodes;
-        }
-
-        /// <summary>
-        /// The action called to render the menu for a tree node
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="queryStrings"></param>
-        /// <returns></returns>
-        [HttpQueryStringFilter("queryStrings")]
-        public MenuItemCollection GetMenu(string id, FormDataCollection queryStrings)
-        {
-            if (queryStrings == null) queryStrings = new FormDataCollection("");
-            var menu = GetMenuForNode(id, queryStrings);
-            //raise the event
-            OnMenuRendering(this, new MenuRenderingEventArgs(id, menu, queryStrings));
-            return menu;
-        }
-
-        /// <summary>
-        /// Helper method to create a root model for a tree
-        /// </summary>
-        /// <returns></returns>
-        protected virtual TreeNode CreateRootNode(FormDataCollection queryStrings)
-        {
-            var rootNodeAsString = Constants.System.Root.ToString(CultureInfo.InvariantCulture);           
-            var currApp = queryStrings.GetValue<string>(TreeQueryStringParameters.Application);
-
-            var node = new TreeNode(
-                rootNodeAsString,
-                Url.GetTreeUrl(GetType(), rootNodeAsString, queryStrings),
-                Url.GetMenuUrl(GetType(), rootNodeAsString, queryStrings))
-                {
-                    HasChildren = true,
-                    RoutePath = currApp,
-                    Title = RootNodeDisplayName
-                };
-
-            return node;
-        }
-
-        /// <summary>
-        /// The AdditionalData of a node is always populated with the query string data, this method performs this
-        /// operation and ensures that special values are not inserted or that duplicate keys are not added.
-        /// </summary>
-        /// <param name="node"></param>
-        /// <param name="queryStrings"></param>
-        protected void AddQueryStringsToAdditionalData(TreeNode node, FormDataCollection queryStrings)
-        {
-            foreach (var q in queryStrings.Where(x => node.AdditionalData.ContainsKey(x.Key) == false))
-            {
-                node.AdditionalData.Add(q.Key, q.Value);
-            }
-        }
-
-        /// <summary>
-        /// If the request is for a dialog mode tree
-        /// </summary>
-        /// <param name="queryStrings"></param>
-        /// <returns></returns>
-        protected bool IsDialog(FormDataCollection queryStrings)
-        {
-            return queryStrings.GetValue<bool>(TreeQueryStringParameters.IsDialog);
-        }
-
-        /// <summary>
-        /// An event that allows developers to modify the tree node collection that is being rendered
-        /// </summary>
-        /// <remarks>
-        /// Developers can add/remove/replace/insert/update/etc... any of the tree items in the collection.
-        /// </remarks>
-        public static event TypedEventHandler<TreeControllerBase, TreeNodesRenderingEventArgs> TreeNodesRendering;
-
-        private static void OnTreeNodesRendering(TreeControllerBase instance, TreeNodesRenderingEventArgs e)
-        {
-            var handler = TreeNodesRendering;
-            if (handler != null) handler(instance, e);
-        }
-
-        /// <summary>
-        /// An event that allows developer to modify the root tree node that is being rendered
-        /// </summary>
-        public static event TypedEventHandler<TreeControllerBase, TreeNodeRenderingEventArgs> RootNodeRendering;
-
-        private static void OnRootNodeRendering(TreeControllerBase instance, TreeNodeRenderingEventArgs e)
-        {
-            var handler = RootNodeRendering;
-            if (handler != null) handler(instance, e);
-        }
-
-        /// <summary>
-        /// An event that allows developers to modify the meun that is being rendered
-        /// </summary>
-        /// <remarks>
-        /// Developers can add/remove/replace/insert/update/etc... any of the tree items in the collection.
-        /// </remarks>
-        public static event TypedEventHandler<TreeControllerBase, MenuRenderingEventArgs> MenuRendering;
-
-        private static void OnMenuRendering(TreeControllerBase instance, MenuRenderingEventArgs e)
-        {
-            var handler = MenuRendering;
-            if (handler != null) handler(instance, e);
-        }
-    }
-
     /// <summary>
     /// The base controller for all tree requests
     /// </summary>
@@ -273,95 +48,5 @@ namespace Umbraco.Web.Trees
             get { return _attribute.Alias; }
         }
 
-        #region Create TreeNode methods
-
-        /// <summary>
-        /// Helper method to create tree nodes
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="queryStrings"></param>
-        /// <param name="title"></param>
-        /// <returns></returns>
-        public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title)
-        {
-            var jsonUrl = Url.GetTreeUrl(GetType(), id, queryStrings);
-            var menuUrl = Url.GetMenuUrl(GetType(), id, queryStrings);
-            var node = new TreeNode(id, jsonUrl, menuUrl) { Title = title };
-            return node;
-        }
-
-        /// <summary>
-        /// Helper method to create tree nodes
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="queryStrings"></param>
-        /// <param name="title"></param>
-        /// <param name="icon"></param>
-        /// <returns></returns>
-        public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title, string icon)
-        {
-            var jsonUrl = Url.GetTreeUrl(GetType(), id, queryStrings);
-            var menuUrl = Url.GetMenuUrl(GetType(), id, queryStrings);
-            var node = new TreeNode(id, jsonUrl, menuUrl) { Title = title, Icon = icon };
-            return node;
-        }
-
-        /// <summary>
-        /// Helper method to create tree nodes
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="queryStrings"></param>
-        /// <param name="title"></param>
-        /// <param name="routePath"></param>
-        /// <param name="icon"></param>
-        /// <returns></returns>
-        public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title, string icon, string routePath)
-        {
-            var jsonUrl = Url.GetTreeUrl(GetType(), id, queryStrings);
-            var menuUrl = Url.GetMenuUrl(GetType(), id, queryStrings);
-            var node = new TreeNode(id, jsonUrl, menuUrl) { Title = title, RoutePath = routePath, Icon = icon };
-            return node;
-        }
-
-        /// <summary>
-        /// Helper method to create tree nodes and automatically generate the json url
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="queryStrings"></param>
-        /// <param name="title"></param>
-        /// <param name="icon"></param>
-        /// <param name="hasChildren"></param>
-        /// <returns></returns>
-        public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title, string icon, bool hasChildren)
-        {
-            var treeNode = CreateTreeNode(id, queryStrings, title, icon);
-            treeNode.HasChildren = hasChildren;
-            return treeNode;
-        }
-
-        /// <summary>
-        /// Helper method to create tree nodes and automatically generate the json url
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="queryStrings"></param>
-        /// <param name="title"></param>
-        /// <param name="routePath"></param>
-        /// <param name="hasChildren"></param>
-        /// <param name="icon"></param>
-        /// <returns></returns>
-        public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title, string icon, bool hasChildren, string routePath)
-        {
-            var treeNode = CreateTreeNode(id, queryStrings, title, icon);
-            treeNode.HasChildren = hasChildren;
-            treeNode.RoutePath = routePath;
-            return treeNode;
-        }
-
-        #endregion
-
-        #region Query String parameter helpers
-
-        #endregion
-        
     }
 }
diff --git a/src/Umbraco.Web/Trees/TreeControllerBase.cs b/src/Umbraco.Web/Trees/TreeControllerBase.cs
new file mode 100644
index 0000000000..ac25fc82f4
--- /dev/null
+++ b/src/Umbraco.Web/Trees/TreeControllerBase.cs
@@ -0,0 +1,318 @@
+using System;
+using System.Globalization;
+using System.Linq;
+using System.Net.Http.Formatting;
+using Umbraco.Core;
+using Umbraco.Core.Events;
+using Umbraco.Web.Models.Trees;
+using Umbraco.Web.WebApi;
+using Umbraco.Web.WebApi.Filters;
+
+namespace Umbraco.Web.Trees
+{
+    /// <summary>
+    /// A base controller reference for non-attributed trees (un-registered). Developers should inherit from
+    /// TreeController.
+    /// </summary>
+    public abstract class TreeControllerBase : UmbracoAuthorizedApiController
+    {
+        /// <summary>
+        /// Remove the xml formatter... only support JSON!
+        /// </summary>
+        /// <param name="controllerContext"></param>
+        protected override void Initialize(global::System.Web.Http.Controllers.HttpControllerContext controllerContext)
+        {
+            base.Initialize(controllerContext);
+            controllerContext.Configuration.Formatters.Remove(controllerContext.Configuration.Formatters.XmlFormatter);
+        }
+
+        /// <summary>
+        /// The method called to render the contents of the tree structure
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="queryStrings">
+        /// All of the query string parameters passed from jsTree
+        /// </param>
+        /// <remarks>
+        /// We are allowing an arbitrary number of query strings to be pased in so that developers are able to persist custom data from the front-end
+        /// to the back end to be used in the query for model data.
+        /// </remarks>
+        protected abstract TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings);
+
+        /// <summary>
+        /// Returns the menu structure for the node
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="queryStrings"></param>
+        /// <returns></returns>
+        protected abstract MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings);
+
+        /// <summary>
+        /// The name to display on the root node
+        /// </summary>
+        public abstract string RootNodeDisplayName { get; }
+
+        /// <summary>
+        /// Gets the current tree alias from the attribute assigned to it.
+        /// </summary>
+        public abstract string TreeAlias { get; }
+
+        /// <summary>
+        /// Returns the root node for the tree
+        /// </summary>
+        /// <param name="queryStrings"></param>
+        /// <returns></returns>
+        [HttpQueryStringFilter("queryStrings")]
+        public TreeNode GetRootNode(FormDataCollection queryStrings)
+        {
+            if (queryStrings == null) queryStrings = new FormDataCollection("");
+            var node = CreateRootNode(queryStrings);
+
+            //add the tree alias to the root
+            node.AdditionalData["treeAlias"] = TreeAlias;
+
+            AddQueryStringsToAdditionalData(node, queryStrings);
+
+            //check if the tree is searchable and add that to the meta data as well
+            if (this is ISearchableTree)
+            {
+                node.AdditionalData.Add("searchable", "true");
+            }
+
+            //now update all data based on some of the query strings, like if we are running in dialog mode           
+            if (IsDialog(queryStrings))
+            {
+                node.RoutePath = "#";
+            }
+
+            OnRootNodeRendering(this, new TreeNodeRenderingEventArgs(node, queryStrings));
+
+            return node;
+        }
+
+        /// <summary>
+        /// The action called to render the contents of the tree structure
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="queryStrings">
+        /// All of the query string parameters passed from jsTree
+        /// </param>
+        /// <returns>JSON markup for jsTree</returns>        
+        /// <remarks>
+        /// We are allowing an arbitrary number of query strings to be pased in so that developers are able to persist custom data from the front-end
+        /// to the back end to be used in the query for model data.
+        /// </remarks>
+        [HttpQueryStringFilter("queryStrings")]
+        public TreeNodeCollection GetNodes(string id, FormDataCollection queryStrings)
+        {
+            if (queryStrings == null) queryStrings = new FormDataCollection("");
+            var nodes = GetTreeNodes(id, queryStrings);
+
+            foreach (var node in nodes)
+            {
+                AddQueryStringsToAdditionalData(node, queryStrings);
+            }
+
+            //now update all data based on some of the query strings, like if we are running in dialog mode            
+            if (IsDialog((queryStrings)))
+            {
+                foreach (var node in nodes)
+                {
+                    node.RoutePath = "#";
+                }
+            }
+
+            //raise the event
+            OnTreeNodesRendering(this, new TreeNodesRenderingEventArgs(nodes, queryStrings));
+
+            return nodes;
+        }
+
+        /// <summary>
+        /// The action called to render the menu for a tree node
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="queryStrings"></param>
+        /// <returns></returns>
+        [HttpQueryStringFilter("queryStrings")]
+        public MenuItemCollection GetMenu(string id, FormDataCollection queryStrings)
+        {
+            if (queryStrings == null) queryStrings = new FormDataCollection("");
+            var menu = GetMenuForNode(id, queryStrings);
+            //raise the event
+            OnMenuRendering(this, new MenuRenderingEventArgs(id, menu, queryStrings));
+            return menu;
+        }
+
+        /// <summary>
+        /// Helper method to create a root model for a tree
+        /// </summary>
+        /// <returns></returns>
+        protected virtual TreeNode CreateRootNode(FormDataCollection queryStrings)
+        {
+            var rootNodeAsString = Constants.System.Root.ToString(CultureInfo.InvariantCulture);
+            var currApp = queryStrings.GetValue<string>(TreeQueryStringParameters.Application);
+
+            var node = new TreeNode(
+                rootNodeAsString,
+                Url.GetTreeUrl(GetType(), rootNodeAsString, queryStrings),
+                Url.GetMenuUrl(GetType(), rootNodeAsString, queryStrings))
+                {
+                    HasChildren = true,
+                    RoutePath = currApp,
+                    Title = RootNodeDisplayName
+                };
+
+            return node;
+        }
+
+        #region Create TreeNode methods
+
+        /// <summary>
+        /// Helper method to create tree nodes
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="queryStrings"></param>
+        /// <param name="title"></param>
+        /// <returns></returns>
+        public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title)
+        {
+            var jsonUrl = Url.GetTreeUrl(GetType(), id, queryStrings);
+            var menuUrl = Url.GetMenuUrl(GetType(), id, queryStrings);
+            var node = new TreeNode(id, jsonUrl, menuUrl) { Title = title };
+            return node;
+        }
+
+        /// <summary>
+        /// Helper method to create tree nodes
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="queryStrings"></param>
+        /// <param name="title"></param>
+        /// <param name="icon"></param>
+        /// <returns></returns>
+        public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title, string icon)
+        {
+            var jsonUrl = Url.GetTreeUrl(GetType(), id, queryStrings);
+            var menuUrl = Url.GetMenuUrl(GetType(), id, queryStrings);
+            var node = new TreeNode(id, jsonUrl, menuUrl) { Title = title, Icon = icon };
+            return node;
+        }
+
+        /// <summary>
+        /// Helper method to create tree nodes
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="queryStrings"></param>
+        /// <param name="title"></param>
+        /// <param name="routePath"></param>
+        /// <param name="icon"></param>
+        /// <returns></returns>
+        public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title, string icon, string routePath)
+        {
+            var jsonUrl = Url.GetTreeUrl(GetType(), id, queryStrings);
+            var menuUrl = Url.GetMenuUrl(GetType(), id, queryStrings);
+            var node = new TreeNode(id, jsonUrl, menuUrl) { Title = title, RoutePath = routePath, Icon = icon };
+            return node;
+        }
+
+        /// <summary>
+        /// Helper method to create tree nodes and automatically generate the json url
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="queryStrings"></param>
+        /// <param name="title"></param>
+        /// <param name="icon"></param>
+        /// <param name="hasChildren"></param>
+        /// <returns></returns>
+        public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title, string icon, bool hasChildren)
+        {
+            var treeNode = CreateTreeNode(id, queryStrings, title, icon);
+            treeNode.HasChildren = hasChildren;
+            return treeNode;
+        }
+
+        /// <summary>
+        /// Helper method to create tree nodes and automatically generate the json url
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="queryStrings"></param>
+        /// <param name="title"></param>
+        /// <param name="routePath"></param>
+        /// <param name="hasChildren"></param>
+        /// <param name="icon"></param>
+        /// <returns></returns>
+        public TreeNode CreateTreeNode(string id, FormDataCollection queryStrings, string title, string icon, bool hasChildren, string routePath)
+        {
+            var treeNode = CreateTreeNode(id, queryStrings, title, icon);
+            treeNode.HasChildren = hasChildren;
+            treeNode.RoutePath = routePath;
+            return treeNode;
+        }
+
+        #endregion
+
+        /// <summary>
+        /// The AdditionalData of a node is always populated with the query string data, this method performs this
+        /// operation and ensures that special values are not inserted or that duplicate keys are not added.
+        /// </summary>
+        /// <param name="node"></param>
+        /// <param name="queryStrings"></param>
+        protected void AddQueryStringsToAdditionalData(TreeNode node, FormDataCollection queryStrings)
+        {
+            foreach (var q in queryStrings.Where(x => node.AdditionalData.ContainsKey(x.Key) == false))
+            {
+                node.AdditionalData.Add(q.Key, q.Value);
+            }
+        }
+
+        /// <summary>
+        /// If the request is for a dialog mode tree
+        /// </summary>
+        /// <param name="queryStrings"></param>
+        /// <returns></returns>
+        protected bool IsDialog(FormDataCollection queryStrings)
+        {
+            return queryStrings.GetValue<bool>(TreeQueryStringParameters.IsDialog);
+        }
+
+        /// <summary>
+        /// An event that allows developers to modify the tree node collection that is being rendered
+        /// </summary>
+        /// <remarks>
+        /// Developers can add/remove/replace/insert/update/etc... any of the tree items in the collection.
+        /// </remarks>
+        public static event TypedEventHandler<TreeControllerBase, TreeNodesRenderingEventArgs> TreeNodesRendering;
+
+        private static void OnTreeNodesRendering(TreeControllerBase instance, TreeNodesRenderingEventArgs e)
+        {
+            var handler = TreeNodesRendering;
+            if (handler != null) handler(instance, e);
+        }
+
+        /// <summary>
+        /// An event that allows developer to modify the root tree node that is being rendered
+        /// </summary>
+        public static event TypedEventHandler<TreeControllerBase, TreeNodeRenderingEventArgs> RootNodeRendering;
+
+        private static void OnRootNodeRendering(TreeControllerBase instance, TreeNodeRenderingEventArgs e)
+        {
+            var handler = RootNodeRendering;
+            if (handler != null) handler(instance, e);
+        }
+
+        /// <summary>
+        /// An event that allows developers to modify the meun that is being rendered
+        /// </summary>
+        /// <remarks>
+        /// Developers can add/remove/replace/insert/update/etc... any of the tree items in the collection.
+        /// </remarks>
+        public static event TypedEventHandler<TreeControllerBase, MenuRenderingEventArgs> MenuRendering;
+
+        private static void OnMenuRendering(TreeControllerBase instance, MenuRenderingEventArgs e)
+        {
+            var handler = MenuRendering;
+            if (handler != null) handler(instance, e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index bac4a484f6..a9173caa86 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -413,6 +413,7 @@
     <Compile Include="Trees\MenuRenderingEventArgs.cs" />
     <Compile Include="Models\Trees\CreateChildEntity.cs" />
     <Compile Include="Models\Trees\MenuItemList.cs" />
+    <Compile Include="Trees\TreeControllerBase.cs" />
     <Compile Include="UI\JavaScript\CssInitialization.cs" />
     <Compile Include="umbraco.presentation\umbraco\create.aspx.cs">
       <SubType>ASPXCodeBehind</SubType>
diff --git a/src/umbraco.businesslogic/Application.cs b/src/umbraco.businesslogic/Application.cs
index 601c5fea59..2fd7b3cc02 100644
--- a/src/umbraco.businesslogic/Application.cs
+++ b/src/umbraco.businesslogic/Application.cs
@@ -22,7 +22,7 @@ namespace umbraco.BusinessLogic
     /// <summary>
     /// Class for handling all registered applications in Umbraco.
     /// </summary>
-    [Obsolete("Use Umbraco.Core.Sections.SectionCollection instead")]
+    [Obsolete("Use ApplicationContext.Current.Services.SectionService and/or Umbraco.Core.Sections.SectionCollection instead")]
     public class Application
     {
         private static ISqlHelper _sqlHelper;
diff --git a/src/umbraco.businesslogic/ApplicationTree.cs b/src/umbraco.businesslogic/ApplicationTree.cs
index 734b451f68..6458885edd 100644
--- a/src/umbraco.businesslogic/ApplicationTree.cs
+++ b/src/umbraco.businesslogic/ApplicationTree.cs
@@ -20,7 +20,7 @@ namespace umbraco.BusinessLogic
     /// An application tree is a collection of nodes belonging to one or more application(s).
     /// Through this class new application trees can be created, modified and deleted. 
     /// </summary>
-    [Obsolete("This has been superceded by Umbraco.Core.Trees.ApplicationTree and Umbraco.Core.Trees.ApplicationTreeCollection")]
+    [Obsolete("This has been superceded by ApplicationContext.Current.ApplicationTreeService")]
     public class ApplicationTree
     {