diff --git a/umbraco/presentation/UmbracoContext.cs b/umbraco/presentation/UmbracoContext.cs
index 9e1e669888..2479c664f1 100644
--- a/umbraco/presentation/UmbracoContext.cs
+++ b/umbraco/presentation/UmbracoContext.cs
@@ -7,39 +7,6 @@ using System.Xml.Linq;
 
 namespace umbraco.presentation
 {
-    public class UmbracoServerUtility : HttpServerUtilityWrapper
-    {
-        private HttpServerUtility m_Server;
-
-        public UmbracoServerUtility(HttpServerUtility server) : base(server)
-        {
-            m_Server = server;
-        }
-
-        public string UmbracoPath
-        {
-            get
-            {
-                return GlobalSettings.Path;
-            }
-        }
-
-        public string ContentXmlPath
-        {
-            get
-            {
-                return GlobalSettings.ContentXML;
-            }
-        }
-
-        public XDocument ContentXml
-        {
-            get
-            {
-                return XDocument.Load(this.ContentXmlPath);
-            }
-        }
-    }
     /// <summary>
     /// Class that encapsulates Umbraco information of a specific HTTP request.
     /// </summary>
diff --git a/umbraco/presentation/UmbracoServerUtility.cs b/umbraco/presentation/UmbracoServerUtility.cs
new file mode 100644
index 0000000000..b642c621bf
--- /dev/null
+++ b/umbraco/presentation/UmbracoServerUtility.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Web;
+using umbraco.presentation.LiveEditing;
+using umbraco.BasePages;
+using umbraco.cms.businesslogic.web;
+using System.Xml.Linq;
+
+namespace umbraco.presentation
+{
+    public class UmbracoServerUtility : HttpServerUtilityWrapper
+    {
+        private HttpServerUtility m_Server;
+
+        public UmbracoServerUtility(HttpServerUtility server)
+            : base(server)
+        {
+            m_Server = server;
+        }
+
+        public string UmbracoPath
+        {
+            get
+            {
+                return GlobalSettings.Path;
+            }
+        }
+
+        public string ContentXmlPath
+        {
+            get
+            {
+                return GlobalSettings.ContentXML;
+            }
+        }
+
+        public XDocument ContentXml
+        {
+            get
+            {
+                return XDocument.Load(this.ContentXmlPath);
+            }
+        }
+    }
+}
diff --git a/umbraco/presentation/umbraco.presentation.csproj b/umbraco/presentation/umbraco.presentation.csproj
index 6cead08543..26df62b9bc 100644
--- a/umbraco/presentation/umbraco.presentation.csproj
+++ b/umbraco/presentation/umbraco.presentation.csproj
@@ -332,6 +332,7 @@
     <Compile Include="UmbracoResponse.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="UmbracoServerUtility.cs" />
     <Compile Include="umbraco\ActionHandlers\umbEnsureUniqueName.cs">
       <SubType>Code</SubType>
     </Compile>