diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index ffe63613bf..632f456c7a 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -260,12 +260,19 @@
       <Link>Properties\SolutionInfo.cs</Link>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="umbraco\Umbraco.aspx.cs">
-			<DependentUpon>umbraco.aspx</DependentUpon>
+    <Compile Include="umbraco\TreeInit.aspx.cs">
+			<DependentUpon>treeInit.aspx</DependentUpon>  
 			<SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="umbraco\TreeInit.aspx.designer.cs">
+      <DependentUpon>treeInit.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="umbraco\Umbraco.aspx.cs">
+      <DependentUpon>umbraco.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="umbraco\Umbraco.aspx.designer.cs">
-      <DependentUpon>Umbraco.aspx.cs</DependentUpon>
+      <DependentUpon>Umbraco.aspx</DependentUpon>
     </Compile>
     <Content Include="config\splashes\booting.aspx" />
     <Content Include="config\splashes\noNodes.aspx" />
diff --git a/src/Umbraco.Web.UI/umbraco/TreeInit.aspx.cs b/src/Umbraco.Web.UI/umbraco/TreeInit.aspx.cs
new file mode 100644
index 0000000000..d4ecff71eb
--- /dev/null
+++ b/src/Umbraco.Web.UI/umbraco/TreeInit.aspx.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace Umbraco.Web.UI.Umbraco
+{
+	public partial class TreeInit : global::umbraco.cms.presentation.TreeInit
+	{
+	}
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/TreeInit.aspx.designer.cs b/src/Umbraco.Web.UI/umbraco/TreeInit.aspx.designer.cs
new file mode 100644
index 0000000000..1fd780b875
--- /dev/null
+++ b/src/Umbraco.Web.UI/umbraco/TreeInit.aspx.designer.cs
@@ -0,0 +1,15 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Umbraco.Web.UI.Umbraco {
+    
+    
+    public partial class TreeInit {
+    }
+}
diff --git a/src/Umbraco.Web.UI/umbraco/treeInit.aspx b/src/Umbraco.Web.UI/umbraco/treeInit.aspx
index 40e03b241d..2f6d6ca494 100644
--- a/src/Umbraco.Web.UI/umbraco/treeInit.aspx
+++ b/src/Umbraco.Web.UI/umbraco/treeInit.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="c#" CodeBehind="treeInit.aspx.cs" AutoEventWireup="True" Inherits="umbraco.cms.presentation.TreeInit" %>
+<%@ Page Language="c#" CodeBehind="TreeInit.aspx.cs" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.TreeInit" %>
 <%@ Register Src="controls/Tree/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 83ed28be7a..2a9711016a 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1656,12 +1656,8 @@
       <DependentUpon>tree.aspx</DependentUpon>
     </Compile>
     <Compile Include="umbraco.presentation\umbraco\treeInit.aspx.cs">
-      <DependentUpon>treeInit.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="umbraco.presentation\umbraco\treeInit.aspx.designer.cs">
-      <DependentUpon>treeInit.aspx</DependentUpon>
-    </Compile>
     <Compile Include="umbraco.presentation\umbraco\Trees\BaseContentTree.cs" />
     <Compile Include="umbraco.presentation\umbraco\Trees\BaseTree.cs" />
     <Compile Include="umbraco.presentation\umbraco\Trees\ContentRecycleBin.cs" />
@@ -2084,7 +2080,6 @@
     <Content Include="umbraco.presentation\umbraco\tree.aspx">
       <SubType>ASPXCodeBehind</SubType>
     </Content>
-    <Content Include="umbraco.presentation\umbraco\treeInit.aspx" />
     <Content Include="umbraco.presentation\umbraco\users\EditUser.aspx" />
     <Content Include="umbraco.presentation\umbraco\users\EditUserType.aspx" />
     <!--<Content Include="umbraco.presentation\umbraco\users\PermissionEditor.aspx" />-->
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/treeInit.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/treeInit.aspx
deleted file mode 100644
index 40e03b241d..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/treeInit.aspx
+++ /dev/null
@@ -1,47 +0,0 @@
-<%@ Page Language="c#" CodeBehind="treeInit.aspx.cs" AutoEventWireup="True" Inherits="umbraco.cms.presentation.TreeInit" %>
-<%@ Register Src="controls/Tree/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
-<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" >
-<head id="Head1" runat="server">
-    <title></title>
-	
-    <cc1:UmbracoClientDependencyLoader runat="server" id="ClientLoader" />
-    
-    <umb:CssInclude ID="CssInclude1" runat="server" FilePath="css/umbracoGui.css" PathNameAlias="UmbracoRoot" />
-    
-    <style type="text/css">
-        body
-        {
-            background: #fff;
-            margin: 0px;
-            padding: 0px;
-        }
-    </style>
-    <!--[if IE 6]>
-    <style type="text/css">
-          .sprTree{
-            background-image: url(images/umbraco/sprites_ie6.gif) !Important;
-          } 
-    </style>
-    <![endif]-->
-</head>
-<body>
-    
-    
-    <form id="form1" runat="server">
-    <asp:ScriptManager ID="ScriptManager1" runat="server" EnablePartialRendering="true" LoadScriptsBeforeUI="true">
-	</asp:ScriptManager>
-    <div>
-		<umbraco:TreeControl runat="server" ID="JTree" 
-		    App='<%#TreeParams.App %>' TreeType='<%#TreeParams.TreeType %>'
-            IsDialog="<%#TreeParams.IsDialog %>" ShowContextMenu="<%#TreeParams.ShowContextMenu %>" 
-            DialogMode="<%#TreeParams.DialogMode %>" FunctionToCall="<%#TreeParams.FunctionToCall %>" 
-            NodeKey="<%#TreeParams.NodeKey %>" StartNodeID="<%#TreeParams.StartNodeID %>"  />
-    </div>
-    </form>
-</body>
-</html>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/treeInit.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/treeInit.aspx.cs
index 968afbbdab..618577721a 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/treeInit.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/treeInit.aspx.cs
@@ -27,8 +27,60 @@ namespace umbraco.cms.presentation
             DataBind();
         }
 
-        protected TreeService TreeParams { get; private set; } 
+        protected TreeService TreeParams { get; private set; }
 
-		
+		/// <summary>
+		/// Head1 control.
+		/// </summary>
+		/// <remarks>
+		/// Auto-generated field.
+		/// To modify move field declaration from designer file to code-behind file.
+		/// </remarks>
+		protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+		/// <summary>
+		/// ClientLoader control.
+		/// </summary>
+		/// <remarks>
+		/// Auto-generated field.
+		/// To modify move field declaration from designer file to code-behind file.
+		/// </remarks>
+		protected global::umbraco.uicontrols.UmbracoClientDependencyLoader ClientLoader;
+
+		/// <summary>
+		/// CssInclude1 control.
+		/// </summary>
+		/// <remarks>
+		/// Auto-generated field.
+		/// To modify move field declaration from designer file to code-behind file.
+		/// </remarks>
+		protected global::ClientDependency.Core.Controls.CssInclude CssInclude1;
+
+		/// <summary>
+		/// form1 control.
+		/// </summary>
+		/// <remarks>
+		/// Auto-generated field.
+		/// To modify move field declaration from designer file to code-behind file.
+		/// </remarks>
+		protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+		/// <summary>
+		/// ScriptManager1 control.
+		/// </summary>
+		/// <remarks>
+		/// Auto-generated field.
+		/// To modify move field declaration from designer file to code-behind file.
+		/// </remarks>
+		protected global::System.Web.UI.ScriptManager ScriptManager1;
+
+		/// <summary>
+		/// JTree control.
+		/// </summary>
+		/// <remarks>
+		/// Auto-generated field.
+		/// To modify move field declaration from designer file to code-behind file.
+		/// </remarks>
+		protected global::umbraco.controls.Tree.TreeControl JTree;
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/treeInit.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/treeInit.aspx.designer.cs
deleted file mode 100644
index cea0eed268..0000000000
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/treeInit.aspx.designer.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated. 
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace umbraco.cms.presentation {
-    
-    
-    public partial class TreeInit {
-        
-        /// <summary>
-        /// Head1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-        
-        /// <summary>
-        /// ClientLoader control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.uicontrols.UmbracoClientDependencyLoader ClientLoader;
-        
-        /// <summary>
-        /// CssInclude1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::ClientDependency.Core.Controls.CssInclude CssInclude1;
-        
-        /// <summary>
-        /// form1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
-        /// <summary>
-        /// ScriptManager1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.ScriptManager ScriptManager1;
-        
-        /// <summary>
-        /// JTree control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::umbraco.controls.Tree.TreeControl JTree;
-    }
-}