diff --git a/src/Umbraco.Tests/BusinessLogic/BaseTest.cs b/src/Umbraco.Tests/BusinessLogic/BaseTest.cs
index 73d51e7816..50e6a43331 100644
--- a/src/Umbraco.Tests/BusinessLogic/BaseTest.cs
+++ b/src/Umbraco.Tests/BusinessLogic/BaseTest.cs
@@ -7,7 +7,7 @@ using Umbraco.Core;
 using Umbraco.Tests.TestHelpers;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using GlobalSettings = umbraco.GlobalSettings;
 
 namespace Umbraco.Tests.BusinessLogic
diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
index d31e6dbec8..ea62370655 100644
--- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
+++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
@@ -10,7 +10,7 @@ using Umbraco.Tests.TestHelpers;
 using Umbraco.Web;
 using Umbraco.Web.Routing;
 using umbraco.BusinessLogic;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.cache;
 using umbraco.cms.businesslogic.template;
 
diff --git a/src/Umbraco.Web.UI/install/steps/theend.ascx b/src/Umbraco.Web.UI/install/steps/theend.ascx
index b2b4ffe395..ea0d00696c 100644
--- a/src/Umbraco.Web.UI/install/steps/theend.ascx
+++ b/src/Umbraco.Web.UI/install/steps/theend.ascx
@@ -31,8 +31,8 @@ jQuery(document).ready(function () {
 			<br />
 			If you installed a starter kit you can start by configuring your new site, just click &quot;Preview your new website&quot; and follow the instructions. Or to start adding content right away click &quot;Set up your new website&quot; </p>
 		<ul class="btn-web">
-			<li class="btn-preview-web" id="customizeSite" runat="server"><a href="<%= umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) %>/canvas.aspx?redir=<%= this.ResolveUrl("~/")  %>&umbSkinning=true&umbSkinningConfigurator=true" target="_blank"><span>Set up your new website</span></a></li>
-			<li class="btn-set"><a href="<%= umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) %>/umbraco.aspx"><span>Launch umbraco</span></a></li>
+			<li class="btn-preview-web" id="customizeSite" runat="server"><a href="<%= Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) %>/canvas.aspx?redir=<%= this.ResolveUrl("~/")  %>&umbSkinning=true&umbSkinningConfigurator=true" target="_blank"><span>Set up your new website</span></a></li>
+			<li class="btn-set"><a href="<%= Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) %>/umbraco.aspx"><span>Launch umbraco</span></a></li>
 		</ul>
 	</div>
 	<div class="threcol">
diff --git a/src/Umbraco.Web.UI/umbraco/Default.aspx b/src/Umbraco.Web.UI/umbraco/Default.aspx
index 963ced80c2..d3421e3997 100644
--- a/src/Umbraco.Web.UI/umbraco/Default.aspx
+++ b/src/Umbraco.Web.UI/umbraco/Default.aspx
@@ -12,7 +12,7 @@
     }
   </script>
   
-  <link href="<%= umbraco.IO.IOHelper.ResolveUrl( umbraco.IO.SystemDirectories.Umbraco_client ) %>/ui/default.css" type="text/css" rel="stylesheet"/>
+  <link href="<%= Umbraco.Core.IO.IOHelper.ResolveUrl( Umbraco.Core.IO.SystemDirectories.UmbracoClient ) %>/ui/default.css" type="text/css" rel="stylesheet"/>
   <style type="text/css">
     body {
       text-align: center;
diff --git a/src/Umbraco.Web.UI/umbraco/Search/QuickSearch.ascx b/src/Umbraco.Web.UI/umbraco/Search/QuickSearch.ascx
index c3a8df1f7d..e6dc8ebb85 100644
--- a/src/Umbraco.Web.UI/umbraco/Search/QuickSearch.ascx
+++ b/src/Umbraco.Web.UI/umbraco/Search/QuickSearch.ascx
@@ -6,7 +6,7 @@
 
 <script type="text/javascript">
     jQuery(document).ready(function () {
-        jQuery("#umbSearchField").UmbQuickSearch('<%= umbraco.IO.IOHelper.ResolveUrl( umbraco.IO.SystemDirectories.Umbraco ) + "/Search/QuickSearchHandler.ashx" %>');
+        jQuery("#umbSearchField").UmbQuickSearch('<%= Umbraco.Core.IO.IOHelper.ResolveUrl( Umbraco.Core.IO.SystemDirectories.Umbraco ) + "/Search/QuickSearchHandler.ashx" %>');
 
         UmbClientMgr.historyManager().addEventHandler("navigating", function (e, app) {
             jQuery("#umbSearchField").flushCache();
diff --git a/src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx b/src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
index b99e16d8fc..4cdad45578 100644
--- a/src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
+++ b/src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
@@ -10,7 +10,7 @@
 			<h3 style="padding: 0px; margin: 0px;">
 			<asp:ImageButton ID="DeleteButton2" Runat="server"></asp:ImageButton>
 			 
-			<a href="javascript:expandCollapse('<%=this.ClientID%>');"><img src="<%= umbraco.IO.IOHelper.ResolveUrl( umbraco.IO.SystemDirectories.Umbraco )%>/images/expand.png" style="FLOAT: right"/>
+			<a href="javascript:expandCollapse('<%=this.ClientID%>');"><img src="<%= Umbraco.Core.IO.IOHelper.ResolveUrl( Umbraco.Core.IO.SystemDirectories.Umbraco )%>/images/expand.png" style="FLOAT: right"/>
 			  <asp:Literal ID="FullHeader" Runat="server"></asp:Literal>
 			</a>
 			
@@ -21,7 +21,7 @@
 			
 			<h3 style="padding: 0px; margin: 0px;">
 			  <asp:ImageButton ID="DeleteButton" Runat="server"></asp:ImageButton>
-			  <a href="javascript:expandCollapse('<%=this.ClientID%>');"><img src="<%= umbraco.IO.IOHelper.ResolveUrl(  umbraco.IO.SystemDirectories.Umbraco )%>/images/collapse.png" id="<%=this.ClientID%>_fold" style="FLOAT: right"  />
+			  <a href="javascript:expandCollapse('<%=this.ClientID%>');"><img src="<%= Umbraco.Core.IO.IOHelper.ResolveUrl(  Umbraco.Core.IO.SystemDirectories.Umbraco )%>/images/collapse.png" id="<%=this.ClientID%>_fold" style="FLOAT: right"  />
 			  Edit "<asp:Literal ID="Header" Runat="server"></asp:Literal>"</a>
 			</h3>
 			
diff --git a/src/Umbraco.Web.UI/umbraco/controls/ProgressBar.ascx b/src/Umbraco.Web.UI/umbraco/controls/ProgressBar.ascx
index 42dce282c0..2fb6664d2d 100644
--- a/src/Umbraco.Web.UI/umbraco/controls/ProgressBar.ascx
+++ b/src/Umbraco.Web.UI/umbraco/controls/ProgressBar.ascx
@@ -1,2 +1,2 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProgressBar.ascx.cs" Inherits="umbraco.presentation.umbraco.controls.ProgressBar" %>
-<img src='<%#umbraco.IO.SystemDirectories.Umbraco_client%>/images/progressBar.gif' id="ImgBar" alt='<%#umbraco.ui.Text("publish", "inProgress", null)%>' /><br />
\ No newline at end of file
+<img src='<%#Umbraco.Core.IO.SystemDirectories.UmbracoClient%>/images/progressBar.gif' id="ImgBar" alt='<%#umbraco.ui.Text("publish", "inProgress", null)%>' /><br />
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx b/src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx
index c7fa6aa5d5..41ac545d6f 100644
--- a/src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx
+++ b/src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx
@@ -44,8 +44,8 @@ jQuery(document).ready(function() {
         functionToCall : functionToCall,
         nodeKey : nodeKey,
         treeMode: "<%#Mode.ToString().ToLower()%>",
-        dataUrl: "<%#umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco)%>/webservices/TreeDataService.ashx",
-        serviceUrl: "<%#umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco)%>/webservices/TreeClientService.asmx/GetInitAppTreeData"});
+        dataUrl: "<%#Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco)%>/webservices/TreeDataService.ashx",
+        serviceUrl: "<%#Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco)%>/webservices/TreeClientService.asmx/GetInitAppTreeData"});
         
      //add event handler for ajax errors, this will refresh the whole application
     var mainTree = UmbClientMgr.mainTree();
diff --git a/src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx b/src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx
index a4368ada4c..4afd18ed6a 100644
--- a/src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx
+++ b/src/Umbraco.Web.UI/umbraco/developer/Xslt/editXslt.aspx
@@ -46,7 +46,7 @@
                 //                alert('Please select the xslt to visualize');
             }
 
-            UmbClientMgr.openModalWindow('<%= umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) %>/developer/xslt/xsltVisualize.aspx', 'Visualize XSLT', true, 550, 650);
+            UmbClientMgr.openModalWindow('<%= Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) %>/developer/xslt/xsltVisualize.aspx', 'Visualize XSLT', true, 550, 650);
         }
 		  
     </script>
diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx
index c6fb07ed19..a9fa6de7f7 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx
@@ -6,7 +6,7 @@
 
   <style type="text/css">
     #propertyMapping thead tr th{border-bottom:1px solid #ccc; padding: 4px; padding-right: 25px;
-                                background-image: url(<%= umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco_client) %>/tableSorting/img/bg.gif);     
+                                background-image: url(<%= Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.UmbracoClient) %>/tableSorting/img/bg.gif);     
                                 cursor: pointer; 
                                 font-weight: bold; 
                                 background-repeat: no-repeat; 
diff --git a/src/Umbraco.Web.UI/umbraco/plugins/uGoLive/Dashboard.ascx b/src/Umbraco.Web.UI/umbraco/plugins/uGoLive/Dashboard.ascx
index 94b056f296..a5ee2d2ba5 100644
--- a/src/Umbraco.Web.UI/umbraco/plugins/uGoLive/Dashboard.ascx
+++ b/src/Umbraco.Web.UI/umbraco/plugins/uGoLive/Dashboard.ascx
@@ -1,6 +1,6 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="Dashboard.ascx.cs" Inherits="Our.Umbraco.uGoLive.Web.Umbraco.Plugins.uGoLive.Dashboard" %>
-<%@ Import Namespace="umbraco.IO" %>
 <%@ Import Namespace="Our.Umbraco.uGoLive.Web" %>
+<%@ Import Namespace="Umbraco.Core.IO" %>
 <%@ Register Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" TagPrefix="cdf" %>
 
 <cdf:CssInclude ID="CssInclude1" runat="server" FilePath="propertypane/style.css" PathNameAlias="UmbracoClient"  />
diff --git a/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx b/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx
index 84a2579687..477812a50e 100644
--- a/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx
+++ b/src/Umbraco.Web.UI/umbraco/settings/editTemplate.aspx
@@ -62,10 +62,10 @@
 
             var templateCode = UmbEditor.GetCode();
             var selectedTemplate = templateDropDown.options[templateDropDown.selectedIndex].id;
-            var masterTemplate = "<%= umbraco.IO.SystemDirectories.Masterpages%>/" + selectedTemplate + ".master";
+            var masterTemplate = "<%= Umbraco.Core.IO.SystemDirectories.Masterpages%>/" + selectedTemplate + ".master";
 
             if (selectedTemplate == "")
-                masterTemplate = "<%= umbraco.IO.SystemDirectories.Umbraco%>/masterpages/default.master";
+                masterTemplate = "<%= Umbraco.Core.IO.SystemDirectories.Umbraco%>/masterpages/default.master";
 
             var regex = /MasterPageFile=[~a-z0-9/._"-]+/im;
 
diff --git a/src/Umbraco.Web.UI/umbraco/umbraco.aspx b/src/Umbraco.Web.UI/umbraco/umbraco.aspx
index 0bcb810d20..348a5a9143 100644
--- a/src/Umbraco.Web.UI/umbraco/umbraco.aspx
+++ b/src/Umbraco.Web.UI/umbraco/umbraco.aspx
@@ -157,7 +157,7 @@
         var initApp = '<%=umbraco.presentation.UmbracoContext.Current.Request.QueryString["app"]%>';
         var rightAction = '<%=umbraco.presentation.UmbracoContext.Current.Request.QueryString["rightAction"]%>';
         var rightActionId = '<%=umbraco.presentation.UmbracoContext.Current.Request.QueryString["id"]%>';
-        var base = '<%=string.Format("{0}/", umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco))%>';
+        var base = '<%=string.Format("{0}/", Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco))%>';
         var url = ''
         if (rightActionId && rightActionId != '') {
             url = base + rightAction + ".aspx?id=" + rightActionId
@@ -166,7 +166,7 @@
         }
         jQuery(document).ready(function () {
 
-            UmbClientMgr.setUmbracoPath("<%=umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) %>");
+            UmbClientMgr.setUmbracoPath("<%=Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) %>");
 
             //call wresize first for IE/FF resize issues
             jQuery(window).wresize(function () { resizePage(); });
diff --git a/src/Umbraco.Web/Media/ThumbnailProviders/FileExtensionIconThumbnailProvider.cs b/src/Umbraco.Web/Media/ThumbnailProviders/FileExtensionIconThumbnailProvider.cs
index a96eea0475..4d6489cb2c 100644
--- a/src/Umbraco.Web/Media/ThumbnailProviders/FileExtensionIconThumbnailProvider.cs
+++ b/src/Umbraco.Web/Media/ThumbnailProviders/FileExtensionIconThumbnailProvider.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using Umbraco.Core.ObjectResolution;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace Umbraco.Web.Media.ThumbnailProviders
 {
diff --git a/src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs b/src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs
index 8b5aeaf318..a2777c0137 100644
--- a/src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs
+++ b/src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs
@@ -6,7 +6,7 @@ using System.Text;
 using Umbraco.Core;
 using Umbraco.Core.IO;
 using Umbraco.Core.ObjectResolution;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace Umbraco.Web.Media.ThumbnailProviders
 {
diff --git a/src/Umbraco.Web/Media/ThumbnailProviders/MediaTypeIconThumbnailProvider.cs b/src/Umbraco.Web/Media/ThumbnailProviders/MediaTypeIconThumbnailProvider.cs
index ce6ee054a4..be1e6b4b42 100644
--- a/src/Umbraco.Web/Media/ThumbnailProviders/MediaTypeIconThumbnailProvider.cs
+++ b/src/Umbraco.Web/Media/ThumbnailProviders/MediaTypeIconThumbnailProvider.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using Umbraco.Core.ObjectResolution;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace Umbraco.Web.Media.ThumbnailProviders
 {
diff --git a/src/Umbraco.Web/UI/Controls/FolderBrowser.cs b/src/Umbraco.Web/UI/Controls/FolderBrowser.cs
index 421d9c369d..305cc702db 100644
--- a/src/Umbraco.Web/UI/Controls/FolderBrowser.cs
+++ b/src/Umbraco.Web/UI/Controls/FolderBrowser.cs
@@ -5,7 +5,7 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using ClientDependency.Core;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace Umbraco.Web.UI.Controls
 {
diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs
index 2458dc62e0..19e436768d 100644
--- a/src/Umbraco.Web/UmbracoContext.cs
+++ b/src/Umbraco.Web/UmbracoContext.cs
@@ -7,7 +7,7 @@ using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
 using Umbraco.Web.Security;
 using umbraco;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.presentation;
 using umbraco.presentation.LiveEditing;
 using umbraco.BasePages;
diff --git a/src/Umbraco.Web/umbraco.presentation/LegacyClasses.cs b/src/Umbraco.Web/umbraco.presentation/LegacyClasses.cs
index 7cf13a6466..c515f5e16f 100644
--- a/src/Umbraco.Web/umbraco.presentation/LegacyClasses.cs
+++ b/src/Umbraco.Web/umbraco.presentation/LegacyClasses.cs
@@ -9,7 +9,7 @@ using System.Web;
 using System.Web.UI;
 using System.Xml;
 using Umbraco.Core;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.NodeFactory;
 using umbraco.cms.businesslogic.web;
 using umbraco.interfaces;
diff --git a/src/Umbraco.Web/umbraco.presentation/NotFoundHandlers.cs b/src/Umbraco.Web/umbraco.presentation/NotFoundHandlers.cs
index ac449e8118..4b8efb5660 100644
--- a/src/Umbraco.Web/umbraco.presentation/NotFoundHandlers.cs
+++ b/src/Umbraco.Web/umbraco.presentation/NotFoundHandlers.cs
@@ -10,7 +10,7 @@ using umbraco.cms.businesslogic.member;
 using umbraco.cms.businesslogic.template;
 using umbraco.cms.businesslogic.web;
 using umbraco.interfaces;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.NodeFactory;
 
 namespace umbraco {
diff --git a/src/Umbraco.Web/umbraco.presentation/UmbracoServerUtility.cs b/src/Umbraco.Web/umbraco.presentation/UmbracoServerUtility.cs
index dabed36edf..1dd0245ea2 100644
--- a/src/Umbraco.Web/umbraco.presentation/UmbracoServerUtility.cs
+++ b/src/Umbraco.Web/umbraco.presentation/UmbracoServerUtility.cs
@@ -4,7 +4,7 @@ using umbraco.presentation.LiveEditing;
 using umbraco.BasePages;
 using umbraco.cms.businesslogic.web;
 using System.Xml.Linq;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.presentation.preview;
 using umbraco.BusinessLogic;
 using System.Xml;
diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/LegacyClasses.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/LegacyClasses.cs
index b87ac20f58..9091005fa7 100644
--- a/src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/LegacyClasses.cs
+++ b/src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/LegacyClasses.cs
@@ -27,7 +27,7 @@ namespace umbraco.presentation.install.steps.Definitions
 
         public override string UserControl
         {
-            get { return IO.SystemDirectories.Install + "/steps/welcome.ascx"; }
+            get { return SystemDirectories.Install + "/steps/welcome.ascx"; }
         }
 
         public override bool Completed()
@@ -60,7 +60,7 @@ namespace umbraco.presentation.install.steps.Definitions
 
         public override string UserControl
         {
-            get { return IO.SystemDirectories.Install + "/steps/skinning.ascx"; }
+            get { return SystemDirectories.Install + "/steps/skinning.ascx"; }
         }
 
         public override bool Completed()
@@ -85,7 +85,7 @@ namespace umbraco.presentation.install.steps.Definitions
 
         public override string UserControl
         {
-            get { return IO.SystemDirectories.Install + "/steps/theend.ascx"; }
+            get { return SystemDirectories.Install + "/steps/theend.ascx"; }
         }
 
         public override bool Completed()
@@ -110,7 +110,7 @@ namespace umbraco.presentation.install.steps.Definitions
 
         public override string UserControl
         {
-            get { return IO.SystemDirectories.Install + "/steps/skinning.ascx"; }
+            get { return SystemDirectories.Install + "/steps/skinning.ascx"; }
         }
 
         public override bool Completed()
@@ -146,7 +146,7 @@ namespace umbraco.presentation.install.steps.Definitions
 
         public override string UserControl
         {
-            get { return IO.SystemDirectories.Install + "/steps/license.ascx"; }
+            get { return SystemDirectories.Install + "/steps/license.ascx"; }
         }
 
         public override bool Completed()
@@ -214,7 +214,7 @@ namespace umbraco.presentation.install.steps.Definitions
 
         public override string UserControl
         {
-            get { return IO.SystemDirectories.Install + "/steps/defaultuser.ascx"; }
+            get { return SystemDirectories.Install + "/steps/defaultuser.ascx"; }
         }
 
         public override bool Completed()
diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/LegacyClasses.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/LegacyClasses.cs
index 6fbdb8f283..d62bada27a 100644
--- a/src/Umbraco.Web/umbraco.presentation/install/steps/LegacyClasses.cs
+++ b/src/Umbraco.Web/umbraco.presentation/install/steps/LegacyClasses.cs
@@ -54,8 +54,8 @@ namespace umbraco.presentation.install
             {
                 // check if sql ce is present
                 if (
-                    !File.Exists(IO.IOHelper.MapPath(Path.Combine(IO.IOHelper.ResolveUrl(IO.SystemDirectories.Bin), "System.Data.SqlServerCe.dll"))) ||
-                    !File.Exists(IO.IOHelper.MapPath(Path.Combine(IO.IOHelper.ResolveUrl(IO.SystemDirectories.Bin), "SQLCE4Umbraco.dll")))
+                    !File.Exists(IOHelper.MapPath(Path.Combine(IOHelper.ResolveUrl(SystemDirectories.Bin), "System.Data.SqlServerCe.dll"))) ||
+                    !File.Exists(IOHelper.MapPath(Path.Combine(IOHelper.ResolveUrl(SystemDirectories.Bin), "SQLCE4Umbraco.dll")))
                     )
                     return false;
                 else
@@ -679,8 +679,8 @@ namespace umbraco.presentation.install
     [Obsolete("This class is no longer used and will be removed from the codebase in the future. The UserControl that supercedes this is Umbraco.Web.UI.Install.Steps.Renaming")]
     public partial class renaming : System.Web.UI.UserControl
     {
-        private string _oldAccessFilePath = IO.IOHelper.MapPath(IO.SystemDirectories.Data + "/access.xml");
-        private string _newAccessFilePath = IO.IOHelper.MapPath(IO.SystemDirectories.Data + "/access.config");
+        private string _oldAccessFilePath = IOHelper.MapPath(SystemDirectories.Data + "/access.xml");
+        private string _newAccessFilePath = IOHelper.MapPath(SystemDirectories.Data + "/access.config");
         private bool _changesNeeded = false;
 
         protected void Page_Load(object sender, EventArgs e)
@@ -756,7 +756,7 @@ namespace umbraco.presentation.install
 
         private void updateExtensionPaths(string filename)
         {
-            filename = IO.IOHelper.MapPath(IO.SystemDirectories.Config + "/" + filename);
+            filename = IOHelper.MapPath(SystemDirectories.Config + "/" + filename);
             XmlDocument xsltExt = new XmlDocument();
             xsltExt.Load(filename);
 
@@ -785,7 +785,7 @@ namespace umbraco.presentation.install
             {
                 try
                 {
-                    File.Move(_oldAccessFilePath, IO.IOHelper.MapPath(IO.SystemFiles.AccessXml));
+                    File.Move(_oldAccessFilePath, IOHelper.MapPath(SystemFiles.AccessXml));
                     progressText += String.Format("<li>Public Access file renamed</li>");
                 }
                 catch (Exception ee)
@@ -832,7 +832,7 @@ namespace umbraco.presentation.install
 
             // Load the XSLT extensions configuration
             XmlDocument xsltExt = new XmlDocument();
-            xsltExt.Load(IO.IOHelper.MapPath(IO.SystemDirectories.Config + "/" + filename));
+            xsltExt.Load(IOHelper.MapPath(SystemDirectories.Config + "/" + filename));
 
             return xsltExt.SelectNodes("//" + elementName);
         }
@@ -921,7 +921,7 @@ namespace umbraco.presentation.install
         }
         private void showStarterKits()
         {
-            ph_starterKits.Controls.Add(new UserControl().LoadControl(IO.SystemDirectories.Install + "/steps/Skinning/loadStarterKits.ascx"));
+            ph_starterKits.Controls.Add(new UserControl().LoadControl(SystemDirectories.Install + "/steps/Skinning/loadStarterKits.ascx"));
 
             pl_starterKit.Visible = true;
             pl_starterKitDesign.Visible = false;
@@ -931,7 +931,7 @@ namespace umbraco.presentation.install
 
         public void showStarterKitDesigns(Guid starterKitGuid)
         {
-            steps.Skinning.loadStarterKitDesigns ctrl = (steps.Skinning.loadStarterKitDesigns)new UserControl().LoadControl(IO.SystemDirectories.Install + "/steps/Skinning/loadStarterKitDesigns.ascx");
+            steps.Skinning.loadStarterKitDesigns ctrl = (steps.Skinning.loadStarterKitDesigns)new UserControl().LoadControl(SystemDirectories.Install + "/steps/Skinning/loadStarterKitDesigns.ascx");
             ctrl.ID = "StarterKitDesigns";
 
             ctrl.StarterKitGuid = starterKitGuid;
diff --git a/src/Umbraco.Web/umbraco.presentation/library.cs b/src/Umbraco.Web/umbraco.presentation/library.cs
index 466731bb92..804f2ce883 100644
--- a/src/Umbraco.Web/umbraco.presentation/library.cs
+++ b/src/Umbraco.Web/umbraco.presentation/library.cs
@@ -30,7 +30,7 @@ using umbraco.scripting;
 using umbraco.DataLayer;
 using System.Web.Security;
 using umbraco.cms.businesslogic.language;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using System.Collections;
 using System.Collections.Generic;
 using umbraco.cms.businesslogic.cache;
@@ -1129,7 +1129,7 @@ namespace umbraco
         /// </summary>
         public static void AddJquery()
         {
-            RegisterJavaScriptFile("jQuery", String.Format("{0}/ui/jquery.js", IOHelper.ResolveUrl(SystemDirectories.Umbraco_client)));
+            RegisterJavaScriptFile("jQuery", String.Format("{0}/ui/jquery.js", IOHelper.ResolveUrl(SystemDirectories.UmbracoClient)));
         }
 
 
diff --git a/src/Umbraco.Web/umbraco.presentation/python.cs b/src/Umbraco.Web/umbraco.presentation/python.cs
index 61bda0c142..80b80c78a6 100644
--- a/src/Umbraco.Web/umbraco.presentation/python.cs
+++ b/src/Umbraco.Web/umbraco.presentation/python.cs
@@ -1,5 +1,5 @@
 using System;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.scripting
 {
diff --git a/src/Umbraco.Web/umbraco.presentation/requestModule.cs b/src/Umbraco.Web/umbraco.presentation/requestModule.cs
index 466579e687..5546264a7f 100644
--- a/src/Umbraco.Web/umbraco.presentation/requestModule.cs
+++ b/src/Umbraco.Web/umbraco.presentation/requestModule.cs
@@ -11,7 +11,7 @@ using umbraco.BusinessLogic.Utils;
 using umbraco.businesslogic;
 using umbraco.cms.businesslogic.cache;
 using System.Web.Caching;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.interfaces;
 
 
diff --git a/src/Umbraco.Web/umbraco.presentation/template.cs b/src/Umbraco.Web/umbraco.presentation/template.cs
index 6e596ab5cd..f620c4ea11 100644
--- a/src/Umbraco.Web/umbraco.presentation/template.cs
+++ b/src/Umbraco.Web/umbraco.presentation/template.cs
@@ -15,7 +15,7 @@ using Umbraco.Web;
 using Umbraco.Web.Cache;
 using umbraco.DataLayer;
 using umbraco.BusinessLogic;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using System.Web;
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Controls/LiveEditingToolbar.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Controls/LiveEditingToolbar.cs
index a61fa2e2fd..7fd812ab54 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Controls/LiveEditingToolbar.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Controls/LiveEditingToolbar.cs
@@ -13,7 +13,7 @@ using umbraco.cms.businesslogic.web;
 using umbraco.BusinessLogic.Actions;
 using umbraco.presentation.umbraco.controls;
 using ClientDependency.Core;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule;
 using umbraco.cms.businesslogic.skinning;
 using umbraco.BusinessLogic;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/CreateModule/CreateModule.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/CreateModule/CreateModule.cs
index 43748c80bd..70baa0c137 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/CreateModule/CreateModule.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/CreateModule/CreateModule.cs
@@ -6,7 +6,7 @@ using umbraco.presentation.LiveEditing.Controls;
 using Content = umbraco.cms.businesslogic.Content;
 using umbraco.BusinessLogic.Actions;
 using ClientDependency.Core;
-using umbraco.IO;
+using Umbraco.Core.IO;
 namespace umbraco.presentation.LiveEditing.Modules.CreateModule
 {
 	[ClientDependency(200, ClientDependencyType.Javascript, "LiveEditing/Modules/CreateModule/CreateModule.js", "UmbracoRoot")]
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/DeleteModule/DeleteModule.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/DeleteModule/DeleteModule.cs
index 08a29a3cb2..4a39ff48d8 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/DeleteModule/DeleteModule.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/DeleteModule/DeleteModule.cs
@@ -5,7 +5,7 @@ using umbraco.cms.businesslogic.web;
 using umbraco.presentation.LiveEditing.Controls;
 using umbraco.BusinessLogic.Actions;
 using ClientDependency.Core;
-using umbraco.IO;
+using Umbraco.Core.IO;
 namespace umbraco.presentation.LiveEditing.Modules.DeleteModule
 {
     [ClientDependency(200, ClientDependencyType.Javascript, "LiveEditing/Modules/DeleteModule/DeleteModule.js", "UmbracoRoot")]
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/MacroModule/MacroModule.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/MacroModule/MacroModule.cs
index 56a4875793..ff1d50fc11 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/MacroModule/MacroModule.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/MacroModule/MacroModule.cs
@@ -8,7 +8,7 @@ using umbraco.presentation.LiveEditing.Updates;
 using umbraco.presentation.templateControls;
 using UM = umbraco.cms.businesslogic.macro;
 using ClientDependency.Core;
-using umbraco.IO;
+using Umbraco.Core.IO;
 namespace umbraco.presentation.LiveEditing.Modules.MacroEditing
 {
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs
index 2c592a5a79..245aabbd7c 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs
@@ -8,6 +8,7 @@ using System.IO;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
+using Umbraco.Core.IO;
 using umbraco.BusinessLogic;
 
 namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule
@@ -36,7 +37,7 @@ namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule
             {
                 
                 Guid g = Guid.NewGuid();
-                DirectoryInfo updir = new DirectoryInfo(IO.IOHelper.MapPath("~/media/upload/" + g));
+                DirectoryInfo updir = new DirectoryInfo(IOHelper.MapPath("~/media/upload/" + g));
                
                 if (!updir.Exists)
                     updir.Create();
@@ -55,7 +56,7 @@ namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule
 
                         if (Convert.ToInt32(Request["w"]) > MaxWidth || Convert.ToInt32(Request["h"]) > MaxHeight)
                         {
-                            System.Drawing.Image img = System.Drawing.Image.FromFile(IO.IOHelper.MapPath(Image.Value));
+                            System.Drawing.Image img = System.Drawing.Image.FromFile(IOHelper.MapPath(Image.Value));
 
                             Image1.Width = img.Width / 2;
                             Image1.Height = img.Height / 2;
@@ -91,7 +92,7 @@ namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule
 
         protected void bt_crop_Click(object sender, EventArgs e)
         {
-            System.Drawing.Image imgToResize = System.Drawing.Image.FromFile(IO.IOHelper.MapPath(Image.Value));
+            System.Drawing.Image imgToResize = System.Drawing.Image.FromFile(IOHelper.MapPath(Image.Value));
 
             int sourceWidth = imgToResize.Width;
             int sourceHeight = imgToResize.Height;
@@ -126,12 +127,12 @@ namespace umbraco.presentation.umbraco.LiveEditing.Modules.SkinModule
 
 
             Guid id = Guid.NewGuid();
-            DirectoryInfo updir = new DirectoryInfo(IO.IOHelper.MapPath("~/media/upload/" + id));
+            DirectoryInfo updir = new DirectoryInfo(IOHelper.MapPath("~/media/upload/" + id));
 
             if (!updir.Exists)
                 updir.Create();
 
-            FileInfo img = new FileInfo(IO.IOHelper.MapPath(Image.Value));
+            FileInfo img = new FileInfo(IOHelper.MapPath(Image.Value));
             // Copy metadata
             ImageCodecInfo[] codecs = ImageCodecInfo.GetImageEncoders();
             ImageCodecInfo codec = null;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs
index 75194be3b2..7f695373f1 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinCustomizer.ascx.cs
@@ -9,7 +9,7 @@ using umbraco.cms.businesslogic.skinning;
 using System.Xml;
 using System.Text;
 using umbraco.interfaces.skinning;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.template;
 using umbraco.BusinessLogic;
 using umbraco.NodeFactory;
@@ -87,7 +87,7 @@ namespace umbraco.presentation.LiveEditing.Modules.SkinModule
 
                 //save
 
-                StreamWriter sw = File.AppendText(IO.IOHelper.MapPath(SystemDirectories.Css) + "/" + this.ActiveSkin.Css.TargetFile);
+                StreamWriter sw = File.AppendText(IOHelper.MapPath(SystemDirectories.Css) + "/" + this.ActiveSkin.Css.TargetFile);
                 sw.Write(content);
                 sw.Close();
             }
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs
index 2405b37695..283b3be53c 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/SkinModule.cs
@@ -3,7 +3,7 @@ using umbraco.presentation.LiveEditing.Modules;
 using ClientDependency.Core;
 using System.Web.UI.WebControls;
 using umbraco.presentation.LiveEditing.Controls;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using System.Web.UI;
 using umbraco.cms.businesslogic.skinning;
 using ClientDependency.Core.Controls;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/UnpublishModule/UnpublishModule.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/UnpublishModule/UnpublishModule.cs
index 39a6ee9f86..6adcf07674 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/UnpublishModule/UnpublishModule.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/UnpublishModule/UnpublishModule.cs
@@ -5,7 +5,7 @@ using umbraco.cms.businesslogic.web;
 using umbraco.presentation.LiveEditing.Controls;
 using umbraco.BusinessLogic.Actions;
 using ClientDependency.Core;
-using umbraco.IO;
+using Umbraco.Core.IO;
 namespace umbraco.presentation.LiveEditing.Modules.UnpublishModule
 {
     [ClientDependency(200, ClientDependencyType.Javascript, "LiveEditing/Modules/UnpublishModule/UnpublishModule.js", "UmbracoRoot")]
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeService.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeService.cs
index 458798dd38..8e7098e3d1 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeService.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/TreeService.cs
@@ -21,7 +21,7 @@ using umbraco.cms.businesslogic.web;
 using umbraco.interfaces;
 using umbraco.DataLayer;
 using System.Collections.Specialized;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.uicontrols;
 
 namespace umbraco.cms.presentation.Trees
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.cs
index 5d71a2f606..85f769a251 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/XmlTree.cs
@@ -9,7 +9,7 @@ using System.Web.Script.Serialization;
 using System.Text;
 using umbraco.businesslogic.Utils;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.cms.presentation.Trees
 {
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDLRScripts.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDLRScripts.cs
index 3959400250..fbf2a08fae 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDLRScripts.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDLRScripts.cs
@@ -22,7 +22,7 @@ using umbraco.interfaces;
 using umbraco.DataLayer;
 using umbraco.BusinessLogic.Utils;
 using umbraco.cms.presentation.Trees;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPython.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPython.cs
index a91a748bf9..168f17b60a 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPython.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPython.cs
@@ -23,7 +23,7 @@ using umbraco.interfaces;
 using umbraco.DataLayer;
 using umbraco.BusinessLogic.Utils;
 using umbraco.cms.presentation.Trees;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using Umbraco.Core;
 
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs
index 2dca3d3fba..972343f502 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs
@@ -26,7 +26,7 @@ using umbraco.DataLayer;
 using umbraco.BusinessLogic.Utils;
 using umbraco.cms.presentation.Trees;
 using umbraco.BusinessLogic.Actions;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using Umbraco.Core;
 
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs
index aaa75f750d..3ace78a202 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadTemplates.cs
@@ -8,6 +8,7 @@ using System.Web;
 using System.Xml;
 using System.Configuration;
 using Umbraco.Core;
+using Umbraco.Core.IO;
 using umbraco.BasePages;
 using umbraco.BusinessLogic;
 using umbraco.businesslogic;
@@ -80,11 +81,11 @@ namespace umbraco
 
         private void RenderTemplateFolderItems(string folder, string folderPath, ref XmlTree tree)
         {
-            string relPath = IO.SystemDirectories.Masterpages + "/" + folder;
+            string relPath = SystemDirectories.Masterpages + "/" + folder;
             if (!string.IsNullOrEmpty(folderPath))
                 relPath += folderPath;
 
-            string fullPath = IO.IOHelper.MapPath(relPath);
+            string fullPath = IOHelper.MapPath(relPath);
 
             foreach (string dir in System.IO.Directory.GetDirectories(fullPath))
             {
@@ -154,7 +155,7 @@ namespace umbraco
         {
             if (base.m_id == -1)
             {
-                foreach (string s in Directory.GetDirectories(IO.IOHelper.MapPath(IO.SystemDirectories.Masterpages)))
+                foreach (string s in Directory.GetDirectories(IOHelper.MapPath(SystemDirectories.Masterpages)))
                 {
                     var _s = Path.GetFileNameWithoutExtension(s);
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs
index b2a71a7ace..d18018e80c 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadXslt.cs
@@ -24,7 +24,7 @@ using umbraco.DataLayer;
 using umbraco.cms.presentation.Trees;
 using umbraco.BusinessLogic.Utils;
 using umbraco.BusinessLogic.Actions;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using Umbraco.Core;
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/actions/preview.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/preview.aspx.cs
index 4cad4cae4b..08d33ed969 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/actions/preview.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/actions/preview.aspx.cs
@@ -8,7 +8,7 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using System.Web.UI.HtmlControls;
 using umbraco.cms.businesslogic.web;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.presentation.actions
 {
@@ -28,7 +28,7 @@ namespace umbraco.presentation.actions
         protected void Page_Load(object sender, EventArgs e)
         {
             Document doc = new Document(int.Parse(helper.Request("id")));       
-            Response.Redirect(IOHelper.ResolveUrl(string.Format("{0}/dialogs/preview.aspx?id= {1}", IO.SystemDirectories.Umbraco, doc.Id)));
+            Response.Redirect(IOHelper.ResolveUrl(string.Format("{0}/dialogs/preview.aspx?id= {1}", SystemDirectories.Umbraco, doc.Id)));
         }
     }
 }
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs
index b311b240f1..4df569f87d 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs
@@ -19,7 +19,7 @@ using Post = CookComputing.MetaWeblog.Post;
 
 using System.Collections.Generic;
 using System.Web.Security;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using Umbraco.Core;
 
 namespace umbraco.presentation.channels
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/channels/config.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/config.cs
index 2a6610b4c7..3cb25cb765 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/channels/config.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/channels/config.cs
@@ -3,7 +3,7 @@ using System.IO;
 using System.Web;
 using System.Xml;
 using umbraco.BusinessLogic;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.presentation.channels.businesslogic
 {
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControl.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControl.cs
index 52a476ed09..37f10a1626 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControl.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControl.cs
@@ -3,7 +3,7 @@ using System.Web.UI.HtmlControls;
 using System.Web.UI.WebControls;
 using System.Collections;
 using System.IO;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using System.Linq;
 
 namespace umbraco.controls
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx
index b99e16d8fc..4cdad45578 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx
@@ -10,7 +10,7 @@
 			<h3 style="padding: 0px; margin: 0px;">
 			<asp:ImageButton ID="DeleteButton2" Runat="server"></asp:ImageButton>
 			 
-			<a href="javascript:expandCollapse('<%=this.ClientID%>');"><img src="<%= umbraco.IO.IOHelper.ResolveUrl( umbraco.IO.SystemDirectories.Umbraco )%>/images/expand.png" style="FLOAT: right"/>
+			<a href="javascript:expandCollapse('<%=this.ClientID%>');"><img src="<%= Umbraco.Core.IO.IOHelper.ResolveUrl( Umbraco.Core.IO.SystemDirectories.Umbraco )%>/images/expand.png" style="FLOAT: right"/>
 			  <asp:Literal ID="FullHeader" Runat="server"></asp:Literal>
 			</a>
 			
@@ -21,7 +21,7 @@
 			
 			<h3 style="padding: 0px; margin: 0px;">
 			  <asp:ImageButton ID="DeleteButton" Runat="server"></asp:ImageButton>
-			  <a href="javascript:expandCollapse('<%=this.ClientID%>');"><img src="<%= umbraco.IO.IOHelper.ResolveUrl(  umbraco.IO.SystemDirectories.Umbraco )%>/images/collapse.png" id="<%=this.ClientID%>_fold" style="FLOAT: right"  />
+			  <a href="javascript:expandCollapse('<%=this.ClientID%>');"><img src="<%= Umbraco.Core.IO.IOHelper.ResolveUrl(  Umbraco.Core.IO.SystemDirectories.Umbraco )%>/images/collapse.png" id="<%=this.ClientID%>_fold" style="FLOAT: right"  />
 			  Edit "<asp:Literal ID="Header" Runat="server"></asp:Literal>"</a>
 			</h3>
 			
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericPropertyWrapper.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericPropertyWrapper.cs
index 81a3bf2e50..4cd8d046a9 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericPropertyWrapper.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericPropertyWrapper.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.propertytype;
 
 namespace umbraco.controls.GenericProperties
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewerUpdater.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewerUpdater.asmx.cs
index a93108357a..d03a2a668b 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewerUpdater.asmx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewerUpdater.asmx.cs
@@ -42,7 +42,7 @@ namespace umbraco.controls.Images
 
 			//load the control with the specified properties and render the output as a string and return it
 			Page page = new Page();
-			string path = umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/controls/Images/ImageViewer.ascx";
+			string path = Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) + "/controls/Images/ImageViewer.ascx";
 			
 			ImageViewer imageViewer = page.LoadControl(path) as ImageViewer;
 			imageViewer.MediaId = mediaId;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ProgressBar.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ProgressBar.ascx
index 42dce282c0..2d5ef2d26f 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ProgressBar.ascx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/ProgressBar.ascx
@@ -1,2 +1,2 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="ProgressBar.ascx.cs" Inherits="umbraco.presentation.umbraco.controls.ProgressBar" %>
-<img src='<%#umbraco.IO.SystemDirectories.Umbraco_client%>/images/progressBar.gif' id="ImgBar" alt='<%#umbraco.ui.Text("publish", "inProgress", null)%>' /><br />
\ No newline at end of file
+<img src='<%#Umbraco.Core.IO.SystemDirectories.UmbracoClient%>/images/progressBar.gif' id="ImgBar" alt='<%#umbraco.ui.Text("publish", "inProgress", null)%>' /><br />
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/SaveClickEventArgs.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/SaveClickEventArgs.cs
index 3e19d63189..b318919a3f 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/SaveClickEventArgs.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/SaveClickEventArgs.cs
@@ -8,7 +8,7 @@ using System.Web.UI.HtmlControls;
 using System.Collections;
 using System.Web.UI;
 using ClientDependency.Core;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.presentation;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeControl.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeControl.cs
index 89eeaa74d2..42f7ad8c9b 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeControl.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/CustomTreeControl.cs
@@ -4,7 +4,7 @@ using System.Web.UI;
 using System.Web.UI.HtmlControls;
 using ClientDependency.Core;
 using umbraco.controls.Tree;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.controls.Tree
 {
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx
index c7fa6aa5d5..41ac545d6f 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx
@@ -44,8 +44,8 @@ jQuery(document).ready(function() {
         functionToCall : functionToCall,
         nodeKey : nodeKey,
         treeMode: "<%#Mode.ToString().ToLower()%>",
-        dataUrl: "<%#umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco)%>/webservices/TreeDataService.ashx",
-        serviceUrl: "<%#umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco)%>/webservices/TreeClientService.asmx/GetInitAppTreeData"});
+        dataUrl: "<%#Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco)%>/webservices/TreeDataService.ashx",
+        serviceUrl: "<%#Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco)%>/webservices/TreeClientService.asmx/GetInitAppTreeData"});
         
      //add event handler for ajax errors, this will refresh the whole application
     var mainTree = UmbClientMgr.mainTree();
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/macroParameterControl.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/macroParameterControl.cs
index 1ad137fde9..b50b81917c 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/macroParameterControl.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/macroParameterControl.cs
@@ -9,7 +9,7 @@ using System.Web.UI.WebControls;
 using umbraco.cms.businesslogic.macro;
 using System.Reflection;
 using System.Collections;
-using umbraco.IO;
+using Umbraco.Core.IO;
 namespace umbraco.controls
 {
     [DefaultProperty("Text")]
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs
index 3474022c8d..27f7c8734b 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs
@@ -5,7 +5,7 @@ using Umbraco.Core.Logging;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.member;
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs
index 58ecb44151..7d03131118 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs
@@ -11,6 +11,7 @@ using System.Web.UI.WebControls;
 using System.Web.UI.WebControls.WebParts;
 using System.Xml.Linq;
 using Umbraco.Core;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.macro;
 using umbraco.scripting;
 using umbraco.BasePages;
@@ -58,8 +59,8 @@ namespace umbraco.presentation.create
 
         private void _loadTemplates(ListBox list, string scriptType)
         {
-            string path = IO.SystemDirectories.Umbraco + "/scripting/templates/" + scriptType + "/";
-            string abPath = IO.IOHelper.MapPath(path);
+            string path = SystemDirectories.Umbraco + "/scripting/templates/" + scriptType + "/";
+            string abPath = IOHelper.MapPath(path);
             list.Items.Clear();
 
             // always add the option of an empty one
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScriptingTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScriptingTasks.cs
index 2a2ecfee37..8450d311b3 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScriptingTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScriptingTasks.cs
@@ -6,7 +6,7 @@ using Umbraco.Core.Logging;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.member;
 
 namespace umbraco
@@ -74,7 +74,7 @@ namespace umbraco
             string scriptContent = "";
             if (!string.IsNullOrEmpty(template))
             {
-                System.IO.StreamReader templateFile = System.IO.File.OpenText(IOHelper.MapPath(IO.SystemDirectories.Umbraco + "/scripting/templates/" + template));
+                System.IO.StreamReader templateFile = System.IO.File.OpenText(IOHelper.MapPath(SystemDirectories.Umbraco + "/scripting/templates/" + template));
                 scriptContent = templateFile.ReadToEnd();
                 templateFile.Close();
             }
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/DataTypeTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/DataTypeTasks.cs
index 303e3e8803..93a51192a2 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/DataTypeTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/DataTypeTasks.cs
@@ -4,7 +4,7 @@ using System.Web.Security;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.member;
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/MediaTypeTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/MediaTypeTasks.cs
index 65af089855..7bda9c9623 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/MediaTypeTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/MediaTypeTasks.cs
@@ -5,7 +5,7 @@ using Umbraco.Core;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.member;
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
index 2260ea4ea9..72d862827e 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
@@ -4,7 +4,7 @@ using System.Web.Security;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.member;
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberTypeTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberTypeTasks.cs
index 50c863977e..499e311faa 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberTypeTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberTypeTasks.cs
@@ -4,7 +4,7 @@ using System.Web.Security;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.member;
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/NewMemberUIEventArgs.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/NewMemberUIEventArgs.cs
index 743b81f780..8e7eab0984 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/NewMemberUIEventArgs.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/NewMemberUIEventArgs.cs
@@ -4,7 +4,7 @@ using System.Web.Security;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.member;
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/PythonTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/PythonTasks.cs
index ec1814ff07..2823c171ab 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/PythonTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/PythonTasks.cs
@@ -4,7 +4,7 @@ using System.Web.Security;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.member;
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs
index 5e3f16ca0c..ea2e08128c 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs
@@ -5,7 +5,7 @@ using Umbraco.Core.Logging;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.member;
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/StylesheetTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/StylesheetTasks.cs
index ca02f78496..aca2156157 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/StylesheetTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/StylesheetTasks.cs
@@ -4,7 +4,7 @@ using System.Web.Security;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.member;
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/contentItemTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/contentItemTasks.cs
index 4951a3cfff..ed717a58ad 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/contentItemTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/contentItemTasks.cs
@@ -4,7 +4,7 @@ using System.Web.Security;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.member;
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/contentItemTypeTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/contentItemTypeTasks.cs
index 24fba8215a..15e1b1ba23 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/contentItemTypeTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/contentItemTypeTasks.cs
@@ -4,7 +4,7 @@ using System.Web.Security;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.member;
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/contentTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/contentTasks.cs
index 45cc4a737c..656fff1233 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/contentTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/contentTasks.cs
@@ -4,7 +4,7 @@ using System.Web.Security;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.member;
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/dictionaryTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/dictionaryTasks.cs
index b3a05f1296..74dfbd871a 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/dictionaryTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/dictionaryTasks.cs
@@ -5,7 +5,7 @@ using Umbraco.Core.Logging;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.member;
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/languageTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/languageTasks.cs
index d716c566ba..b11b847c55 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/languageTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/languageTasks.cs
@@ -5,7 +5,7 @@ using System.Web.Security;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.member;
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs
index eb19839f4f..40e931c2da 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs
@@ -4,7 +4,7 @@ using System.Web.Security;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.member;
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/mediaTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/mediaTasks.cs
index 200657ab94..1123857f0b 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/mediaTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/mediaTasks.cs
@@ -5,7 +5,7 @@ using Umbraco.Core.Logging;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.member;
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/memberTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/memberTasks.cs
index 7570bee69a..58c2be8fe2 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/memberTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/memberTasks.cs
@@ -4,7 +4,7 @@ using System.Web.Security;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.member;
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodetypeTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodetypeTasks.cs
index 625d826b50..d47ca194ba 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodetypeTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/nodetypeTasks.cs
@@ -7,7 +7,7 @@ using Umbraco.Core.Models;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.member;
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx.cs
index 89b73e27a3..cf01fc0fb3 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/script.ascx.cs
@@ -10,7 +10,7 @@ using System.Web.UI.WebControls.WebParts;
 using System.Web.UI.HtmlControls;
 using umbraco.cms.helpers;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.presentation.umbraco.create
 {
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/stylesheetPropertyTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/stylesheetPropertyTasks.cs
index 0a9c94cd58..fa310ab403 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/stylesheetPropertyTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/stylesheetPropertyTasks.cs
@@ -4,7 +4,7 @@ using System.Web.Security;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.member;
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/templateTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/templateTasks.cs
index fd0e839165..2a41a994db 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/templateTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/templateTasks.cs
@@ -5,7 +5,7 @@ using Umbraco.Core;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.member;
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs
index e169d1ee8e..4cc59ca11b 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs
@@ -5,7 +5,7 @@ using Umbraco.Core.Logging;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
 using umbraco.BasePages;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.member;
 
 namespace umbraco
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
index e1f57b62d0..52da532b8d 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
@@ -13,7 +13,7 @@ using System.IO;
 using System.Xml;
 using System.Xml.XPath;
 using umbraco.uicontrols;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.helpers;
 using umbraco.BusinessLogic;
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
index b62b6d0bc3..8317f8ab5d 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
@@ -9,7 +9,7 @@ namespace dashboardUtilities
     using umbraco;
     using umbraco.BasePages;
     using umbraco.BusinessLogic;
-    using umbraco.IO;
+    using Umbraco.Core.IO;
 
     public partial class FeedProxy : UmbracoEnsuredPage
     {
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/LatestEdits.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/LatestEdits.ascx.cs
index 7be62ee092..37eab9c3d8 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/LatestEdits.ascx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/LatestEdits.ascx.cs
@@ -1,6 +1,6 @@
 using umbraco.BusinessLogic;
 using System;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.web;
 
 namespace dashboardUtilities
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs
index 8149050bb8..5cf50baa6c 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs
@@ -3,7 +3,7 @@ using System.Collections;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using umbraco.cms.presentation.Trees;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.cms.presentation.developer
 {
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs
index 5fa4a12f6b..76de8e0e4a 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs
@@ -11,7 +11,7 @@ using System.Web.UI.HtmlControls;
 using System.Xml;
 using System.Xml.XPath;
 using Umbraco.Core.Configuration;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.presentation.developer.packages {
     public partial class BrowseRepository : BasePages.UmbracoEnsuredPage {
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs
index 4975783f97..0be95f6fa1 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx.cs
@@ -12,7 +12,7 @@ using umbraco.cms.businesslogic.template;
 using umbraco.cms.businesslogic.web;
 using umbraco.cms.presentation.Trees;
 using umbraco.controls;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.presentation.developer.packages
 {
@@ -226,7 +226,7 @@ namespace umbraco.presentation.developer.packages
 
                     if (!string.IsNullOrEmpty(pack.PackagePath)) {
 
-                        packageUmbFile.Text = " &nbsp; <a href='" + IO.IOHelper.ResolveUrl(pack.PackagePath) + "'>Download</a>";
+                        packageUmbFile.Text = " &nbsp; <a href='" + IOHelper.ResolveUrl(pack.PackagePath) + "'>Download</a>";
 
                         this.ClientTools.ShowSpeechBubble(BasePages.BasePage.speechBubbleIcon.success, "Package saved and published", "");
                     } else {
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/getXsltStatus.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/getXsltStatus.asmx.cs
index 61d03e9515..39a734a158 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/getXsltStatus.asmx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/getXsltStatus.asmx.cs
@@ -7,7 +7,7 @@ using System.Web;
 using System.Web.Services;
 using System.Xml;
 using System.IO;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.presentation.webservices;
 
 namespace umbraco.developer
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx.cs
index b8ba3f7d9e..f76bff3d2c 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltVisualize.aspx.cs
@@ -7,7 +7,7 @@ using System.Web.UI.WebControls;
 using System.Text;
 using System.Xml;
 using System.IO;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.presentation.umbraco.developer.Xslt
 {
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/imageViewer.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/imageViewer.aspx.cs
index 9a2c7a9baa..3a2917f24f 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/imageViewer.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/imageViewer.aspx.cs
@@ -11,7 +11,7 @@ using System.Web.UI.HtmlControls;
 
 using System.IO;
 using umbraco.BusinessLogic;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using Umbraco.Core;
 
 namespace umbraco.dialogs
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/uploadImage.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/uploadImage.aspx.cs
index 86aabc6589..f5b9415f85 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/uploadImage.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/uploadImage.aspx.cs
@@ -11,7 +11,7 @@ using System.Web.UI.HtmlControls;
 
 using System.Xml;
 using umbraco.BusinessLogic;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.dialogs
 {
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs
index 36ce464a63..73a26c4494 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/login.aspx.cs
@@ -13,7 +13,7 @@ using Umbraco.Core.Logging;
 using umbraco.BusinessLogic;
 using System.Web.Security;
 using umbraco.businesslogic.Exceptions;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.cms.businesslogic.web;
 using System.Linq;
 using Umbraco.Core;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoDialog.Master.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoDialog.Master.cs
index 9ffee7ba1c..a5b0cd39ef 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoDialog.Master.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/masterpages/umbracoDialog.Master.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
+using Umbraco.Core.IO;
 
 namespace umbraco.presentation.masterpages
 {
@@ -16,7 +17,7 @@ namespace umbraco.presentation.masterpages
 		protected void Page_Load(object sender, EventArgs e)
 		{
 			ClientLoader.DataBind();
-			ScriptManager.RegisterStartupScript(Page, Page.GetType(), "setRoot", "UmbClientMgr.setUmbracoPath(\"" + IO.IOHelper.ResolveUrl(IO.SystemDirectories.Umbraco) + "\");", true);
+			ScriptManager.RegisterStartupScript(Page, Page.GetType(), "setRoot", "UmbClientMgr.setUmbracoPath(\"" + IOHelper.ResolveUrl(SystemDirectories.Umbraco) + "\");", true);
 			FireOnLoad(e);
 		}
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/GzipModule.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/GzipModule.cs
index 390de21e89..51cfddbaad 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/GzipModule.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/GzipModule.cs
@@ -10,7 +10,7 @@ using System.Web;
 using System.Text.RegularExpressions;
 using System.IO;
 using Umbraco.Core.Logging;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.presentation.plugins.tinymce3
 {
@@ -39,7 +39,7 @@ namespace umbraco.presentation.plugins.tinymce3
 
             // UMBRACO: Populate the configsection if it's empty
             configSection.Add("GzipEnabled", "true");
-            configSection.Add("InstallPath", IOHelper.ResolveUrl(SystemDirectories.Umbraco_client) + "/tinymce3");
+            configSection.Add("InstallPath", IOHelper.ResolveUrl(SystemDirectories.UmbracoClient) + "/tinymce3");
             configSection.Add("GzipExpiresOffset", TimeSpan.FromDays(10).Ticks.ToString());
 
             // Setup cache
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs
index 5b79e66a25..1e5a4615a6 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs
@@ -9,7 +9,7 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using System.Web.UI.HtmlControls;
 using umbraco.cms.presentation.Trees;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.settings
 {
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
index d7b9396350..ad27e96fa0 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
@@ -10,7 +10,7 @@ using umbraco.cms.businesslogic.skinning;
 using umbraco.cms.businesslogic.template;
 using umbraco.cms.presentation.Trees;
 using umbraco.DataLayer;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.uicontrols;
 using System.Linq;
 
@@ -33,9 +33,9 @@ namespace umbraco.cms.presentation.settings
 			base.OnPreRender(e);
 
 			ScriptManager.GetCurrent(Page).Services.Add(
-				new ServiceReference(IOHelper.ResolveUrl(SystemDirectories.Webservices + "/codeEditorSave.asmx")));
+				new ServiceReference(IOHelper.ResolveUrl(SystemDirectories.WebServices + "/codeEditorSave.asmx")));
 			ScriptManager.GetCurrent(Page).Services.Add(
-				new ServiceReference(IOHelper.ResolveUrl(SystemDirectories.Webservices + "/legacyAjaxCalls.asmx")));
+                new ServiceReference(IOHelper.ResolveUrl(SystemDirectories.WebServices + "/legacyAjaxCalls.asmx")));
 		}
 
         protected string TemplateTreeSyncPath { get; private set; }
@@ -125,7 +125,7 @@ namespace umbraco.cms.presentation.settings
 			//uicontrols.MenuIconI umbMacro = Panel1.Menu.NewIcon();
 			//umbMacro.ImageURL = UmbracoPath + "/images/editor/insMacro.gif";
 			//umbMacro.AltText = ui.Text("template", "insertMacro");
-			//umbMacro.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/editMacro.aspx?objectId=" + editorSource.ClientID, ui.Text("template", "insertMacro"), 470, 530);
+			//umbMacro.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) + "/dialogs/editMacro.aspx?objectId=" + editorSource.ClientID, ui.Text("template", "insertMacro"), 470, 530);
 
 			Panel1.Menu.NewElement("div", "splitButtonMacroPlaceHolder", "sbPlaceHolder", 40);
 
@@ -162,7 +162,7 @@ namespace umbraco.cms.presentation.settings
 				MenuIconI umbContainer = Panel1.Menu.NewIcon();
 				umbContainer.ImageURL = UmbracoPath + "/images/editor/skin.gif";
 				umbContainer.AltText = ui.Text("template", "modifyTemplateSkin");
-				//umbContainer.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/TemplateSkinning.aspx?&id=" + _template.Id.ToString(), ui.Text("template", "modifyTemplateSkin"), 570, 420);
+				//umbContainer.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) + "/dialogs/TemplateSkinning.aspx?&id=" + _template.Id.ToString(), ui.Text("template", "modifyTemplateSkin"), 570, 420);
 				umbContainer.OnClickCommand = "window.open('" + GlobalSettings.Path + "/canvas.aspx?redir=" +
 											  ResolveUrl("~/") + "&umbSkinning=true&umbSkinningConfigurator=true" +
 											  "','canvas')";
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs
index e0b6f2dfa0..7163076f60 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/scripts/editScript.aspx.cs
@@ -135,7 +135,7 @@ namespace umbraco.cms.presentation.settings.scripts
                 Panel1.Menu.InsertSplitter();
 
                 uicontrols.MenuIconI helpIcon = Panel1.Menu.NewIcon();
-                helpIcon.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/settings/modals/showumbracotags.aspx?alias=", ui.Text("template", "quickGuide"), 600, 580);
+                helpIcon.OnClickCommand = umbraco.BasePages.ClientTools.Scripts.OpenModalWindow(Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) + "/settings/modals/showumbracotags.aspx?alias=", ui.Text("template", "quickGuide"), 600, 580);
                 helpIcon.ImageURL = UmbracoPath + "/images/editor/help.png";
                 helpIcon.AltText = ui.Text("template", "quickGuide");
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs
index 6fc4e32ea5..9676f1d184 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs
@@ -21,7 +21,7 @@ using Umbraco.Web.Templates;
 using umbraco.cms.businesslogic;
 using umbraco.cms.businesslogic.property;
 using umbraco.cms.businesslogic.web;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.presentation.templateControls
 {
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx.cs
index 2fe924ec1c..a9d4c5d55f 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/default.aspx.cs
@@ -17,7 +17,7 @@ using ICSharpCode.SharpZipLib.Zip;
 using ICSharpCode.SharpZipLib.Zip.Compression;
 using ICSharpCode.SharpZipLib.Zip.Compression.Streams;
 using ICSharpCode.SharpZipLib.GZip;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using System.Collections.Generic;
 
 namespace umbraco.presentation.translation
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/xml.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/xml.aspx.cs
index 08bb957f34..ea50fd23cf 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/translation/xml.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/translation/xml.aspx.cs
@@ -15,7 +15,7 @@ using Umbraco.Core;
 using umbraco.BusinessLogic;
 using umbraco.cms.businesslogic.task;
 using umbraco.cms.businesslogic.web;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.presentation.translation
 {
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.cs
index 7604ae23f9..978837416d 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.cs
@@ -14,7 +14,7 @@ using System.Xml;
 using System.Xml.XPath;
 using umbraco.BusinessLogic.Actions;
 using ClientDependency.Core;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using System.Linq;
 using System.Text;
 using ClientDependency.Core.Controls;
@@ -103,7 +103,7 @@ namespace umbraco.cms.presentation
                 // Add scriptmanager version check
                 ScriptManager sm = ScriptManager.GetCurrent(Page);
                 sm.Scripts.Add(new ScriptReference(SystemDirectories.Umbraco + "/js/umbracoUpgradeChecker.js"));
-                sm.Services.Add(new ServiceReference(SystemDirectories.Webservices + "/CheckForUpgrade.asmx"));
+                sm.Services.Add(new ServiceReference(SystemDirectories.WebServices + "/CheckForUpgrade.asmx"));
 
                 Page.ClientScript.RegisterClientScriptBlock(this.GetType(), "upgradeChecker", "jQuery(document).ready(function() {umbraco.presentation.webservices.CheckForUpgrade.CallUpgradeService(umbracoCheckUpgrade);});", true);
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
index 132917d737..ae49e03c62 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
@@ -18,7 +18,7 @@ using umbraco.presentation.channels.businesslogic;
 using umbraco.uicontrols;
 using umbraco.providers;
 using umbraco.cms.presentation.Trees;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using Umbraco.Core;
 
 namespace umbraco.cms.presentation.user
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs
index 3211033f7d..cff317f9b9 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs
@@ -15,7 +15,7 @@ using umbraco.BusinessLogic.Actions;
 using umbraco.BusinessLogic;
 using umbraco.uicontrols;
 using umbraco.cms.presentation.Trees;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.cms.presentation.user
 {
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.cs
index 935858ca2b..0dd23aaacd 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.cs
@@ -18,7 +18,7 @@ using umbraco.BusinessLogic.Actions;
 using umbraco.interfaces;
 using umbraco.cms.presentation.Trees;
 using System.Xml.XPath;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.cms.presentation.user
 {
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionsHandler.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionsHandler.asmx.cs
index 05044c6e3b..7813e7e5cb 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionsHandler.asmx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionsHandler.asmx.cs
@@ -14,7 +14,7 @@ using umbraco.BasePages;
 using System.Collections.Generic;
 using umbraco.interfaces;
 using umbraco.BusinessLogic.Actions;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.cms.presentation.user
 {
diff --git a/src/Umbraco.Web/umbraco.presentation/umbracobase/baseHttpModule.cs b/src/Umbraco.Web/umbraco.presentation/umbracobase/baseHttpModule.cs
index 3e8138f872..f6559852f5 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbracobase/baseHttpModule.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbracobase/baseHttpModule.cs
@@ -10,6 +10,7 @@ using System.Web.UI;
 using System.Reflection;
 using System.Collections.Specialized;
 using System.Xml;
+using Umbraco.Core.IO;
 using umbraco;
 using umbraco.cms.businesslogic.member;
 using System.Web.SessionState;
@@ -40,7 +41,7 @@ namespace umbraco.presentation.umbracobase
             HttpApplication httpApp = (HttpApplication)sender;
             string url = httpApp.Context.Request.RawUrl;
 
-            string urlStart = IO.IOHelper.ResolveUrl( IO.SystemDirectories.Base ).TrimEnd('/').ToLower() + "/";
+            string urlStart = IOHelper.ResolveUrl( SystemDirectories.Base ).TrimEnd('/').ToLower() + "/";
 
             if (url.ToLower().StartsWith(urlStart))
             {
@@ -61,7 +62,7 @@ namespace umbraco.presentation.umbracobase
 
             //remove extension and split the url
             string url = httpApp.Context.Request.RawUrl;
-            string urlStart = IO.IOHelper.ResolveUrl(IO.SystemDirectories.Base).TrimEnd('/').ToLower() + "/";
+            string urlStart = IOHelper.ResolveUrl(SystemDirectories.Base).TrimEnd('/').ToLower() + "/";
 
             if (url.ToLower().StartsWith(urlStart))
             {                
@@ -73,7 +74,7 @@ namespace umbraco.presentation.umbracobase
                     HttpContext.Current.Handler = resourceHttpHandler.OriginalHandler;
                 }
 
-                string basedir = "/" + IO.SystemDirectories.Base.TrimStart('~').Trim('/') + "/";
+                string basedir = "/" + SystemDirectories.Base.TrimStart('~').Trim('/') + "/";
                 int indexOfBase = url.ToLower().IndexOf(basedir);
                 url = url.Substring(indexOfBase);
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbracobase/restExtension.cs b/src/Umbraco.Web/umbraco.presentation/umbracobase/restExtension.cs
index dbeab6cf53..8a02b65c14 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbracobase/restExtension.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbracobase/restExtension.cs
@@ -6,7 +6,7 @@ using Umbraco.Core;
 using Umbraco.Web;
 using umbraco.BusinessLogic.Utils;
 using umbraco.cms.businesslogic.member;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.presentation.umbracobase
 {
diff --git a/src/umbraco.MacroEngines/RazorCore/RazorMacroEngine.cs b/src/umbraco.MacroEngines/RazorCore/RazorMacroEngine.cs
index 83304f7ab2..0eb1f8ce30 100644
--- a/src/umbraco.MacroEngines/RazorCore/RazorMacroEngine.cs
+++ b/src/umbraco.MacroEngines/RazorCore/RazorMacroEngine.cs
@@ -9,7 +9,7 @@ using System.Web.WebPages;
 using Umbraco.Core;
 using umbraco.cms.businesslogic.macro;
 using umbraco.interfaces;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.MacroEngines
 {
diff --git a/src/umbraco.businesslogic/BasePages/ClientTools.cs b/src/umbraco.businesslogic/BasePages/ClientTools.cs
index 3050448430..eb166a4d0a 100644
--- a/src/umbraco.businesslogic/BasePages/ClientTools.cs
+++ b/src/umbraco.businesslogic/BasePages/ClientTools.cs
@@ -4,7 +4,7 @@ using System.Text;
 using System.Web;
 using umbraco.BasePages;
 using System.Web.UI;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.BusinessLogic;
 
 namespace umbraco.BasePages
diff --git a/src/umbraco.businesslogic/GlobalSettings.cs b/src/umbraco.businesslogic/GlobalSettings.cs
index dd77f843b1..3d797e1fc5 100644
--- a/src/umbraco.businesslogic/GlobalSettings.cs
+++ b/src/umbraco.businesslogic/GlobalSettings.cs
@@ -9,7 +9,7 @@ using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco
 {
diff --git a/src/umbraco.businesslogic/Utils/TypeFinder.cs b/src/umbraco.businesslogic/Utils/TypeFinder.cs
index 6078af706a..3640cc003f 100644
--- a/src/umbraco.businesslogic/Utils/TypeFinder.cs
+++ b/src/umbraco.businesslogic/Utils/TypeFinder.cs
@@ -7,7 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Xml;
 using Umbraco.Core;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.BusinessLogic.Utils
 {
diff --git a/src/umbraco.businesslogic/xmlHelper.cs b/src/umbraco.businesslogic/xmlHelper.cs
index 5eb07b5309..5d187dbfca 100644
--- a/src/umbraco.businesslogic/xmlHelper.cs
+++ b/src/umbraco.businesslogic/xmlHelper.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Xml;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco
 {
diff --git a/src/umbraco.cms/businesslogic/CMSNode.cs b/src/umbraco.cms/businesslogic/CMSNode.cs
index ba8a6ccc35..1254f11591 100644
--- a/src/umbraco.cms/businesslogic/CMSNode.cs
+++ b/src/umbraco.cms/businesslogic/CMSNode.cs
@@ -13,7 +13,7 @@ using umbraco.BusinessLogic;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.ComponentModel;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using System.Collections;
 using umbraco.cms.businesslogic.task;
 using umbraco.cms.businesslogic.workflow;
@@ -57,7 +57,7 @@ namespace umbraco.cms.businesslogic
 
         #region Private static
 
-        private static readonly string DefaultIconCssFile = IOHelper.MapPath(SystemDirectories.Umbraco_client + "/Tree/treeIcons.css");
+        private static readonly string DefaultIconCssFile = IOHelper.MapPath(SystemDirectories.UmbracoClient + "/Tree/treeIcons.css");
         private static readonly List<string> InternalDefaultIconClasses = new List<string>();
         private static readonly ReaderWriterLockSlim Locker = new ReaderWriterLockSlim();
 
diff --git a/src/umbraco.cms/businesslogic/CMSPreviewNode.cs b/src/umbraco.cms/businesslogic/CMSPreviewNode.cs
index fdcbeab082..4cae6acb29 100644
--- a/src/umbraco.cms/businesslogic/CMSPreviewNode.cs
+++ b/src/umbraco.cms/businesslogic/CMSPreviewNode.cs
@@ -8,7 +8,7 @@ using umbraco.BusinessLogic;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.ComponentModel;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.cms.businesslogic
 {
diff --git a/src/umbraco.cms/businesslogic/Packager/Installer.cs b/src/umbraco.cms/businesslogic/Packager/Installer.cs
index 7a8e81cbba..d099849b0f 100644
--- a/src/umbraco.cms/businesslogic/Packager/Installer.cs
+++ b/src/umbraco.cms/businesslogic/Packager/Installer.cs
@@ -16,7 +16,7 @@ using umbraco.DataLayer;
 using System.Diagnostics;
 using umbraco.cms.businesslogic.macro;
 using umbraco.cms.businesslogic.template;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.cms.businesslogic.packager
 {
@@ -961,10 +961,10 @@ namespace umbraco.cms.businesslogic.packager
             if (path.Contains("[$"))
             {
                 //this is experimental and undocumented...
-                path = path.Replace("[$UMBRACO]", IO.SystemDirectories.Umbraco);
-                path = path.Replace("[$UMBRACOCLIENT]", IO.SystemDirectories.Umbraco_client);
-                path = path.Replace("[$CONFIG]", IO.SystemDirectories.Config);
-                path = path.Replace("[$DATA]", IO.SystemDirectories.Data);
+                path = path.Replace("[$UMBRACO]", SystemDirectories.Umbraco);
+                path = path.Replace("[$UMBRACOCLIENT]", SystemDirectories.UmbracoClient);
+                path = path.Replace("[$CONFIG]", SystemDirectories.Config);
+                path = path.Replace("[$DATA]", SystemDirectories.Data);
             }
 
             //to support virtual dirs we try to lookup the file... 
diff --git a/src/umbraco.cms/businesslogic/Packager/PackageActions/addDashboardSection.cs b/src/umbraco.cms/businesslogic/Packager/PackageActions/addDashboardSection.cs
index 70cf3070e7..825b3c63cd 100644
--- a/src/umbraco.cms/businesslogic/Packager/PackageActions/addDashboardSection.cs
+++ b/src/umbraco.cms/businesslogic/Packager/PackageActions/addDashboardSection.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Xml;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.cms.businesslogic.packager.standardPackageActions
 {
diff --git a/src/umbraco.cms/businesslogic/Packager/PackageActions/addProxyFeedHost.cs b/src/umbraco.cms/businesslogic/Packager/PackageActions/addProxyFeedHost.cs
index 113ef2e014..2c718a1d41 100644
--- a/src/umbraco.cms/businesslogic/Packager/PackageActions/addProxyFeedHost.cs
+++ b/src/umbraco.cms/businesslogic/Packager/PackageActions/addProxyFeedHost.cs
@@ -1,5 +1,5 @@
 using System.Xml;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.cms.businesslogic.packager.standardPackageActions
 {
diff --git a/src/umbraco.cms/businesslogic/Packager/PackageActions/addRestExtension.cs b/src/umbraco.cms/businesslogic/Packager/PackageActions/addRestExtension.cs
index f77fdad206..8f63f62f9a 100644
--- a/src/umbraco.cms/businesslogic/Packager/PackageActions/addRestExtension.cs
+++ b/src/umbraco.cms/businesslogic/Packager/PackageActions/addRestExtension.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Xml;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.cms.businesslogic.packager.standardPackageActions
 {
diff --git a/src/umbraco.cms/businesslogic/Packager/PackageActions/addXsltExtension.cs b/src/umbraco.cms/businesslogic/Packager/PackageActions/addXsltExtension.cs
index 848c3cf832..51c729956f 100644
--- a/src/umbraco.cms/businesslogic/Packager/PackageActions/addXsltExtension.cs
+++ b/src/umbraco.cms/businesslogic/Packager/PackageActions/addXsltExtension.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Xml;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.cms.businesslogic.packager.standardPackageActions
 {
diff --git a/src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs b/src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs
index 5e2d887030..3aff552bf8 100644
--- a/src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs
+++ b/src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs
@@ -7,7 +7,7 @@ using Umbraco.Core.Logging;
 using umbraco.cms.businesslogic.template;
 using umbraco.cms.businesslogic.web;
 using umbraco.cms.businesslogic.macro;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 
 namespace umbraco.cms.businesslogic.packager {
@@ -104,7 +104,7 @@ namespace umbraco.cms.businesslogic.packager {
 					int outInt = 0;
 
 					//Path checking...
-					string localPath = IOHelper.MapPath(IO.SystemDirectories.Media + "/" + pack.Folder);
+					string localPath = IOHelper.MapPath(SystemDirectories.Media + "/" + pack.Folder);
 
 					if (!System.IO.Directory.Exists(localPath))
 						System.IO.Directory.CreateDirectory(localPath);
@@ -271,7 +271,7 @@ namespace umbraco.cms.businesslogic.packager {
 					//string packPath = Settings.PackagerRoot.Replace(System.IO.Path.DirectorySeparatorChar.ToString(), "/") + "/" + pack.Name.Replace(' ', '_') + "_" + pack.Version.Replace(' ', '_') + "." + Settings.PackageFileExtension;
 
 					// check if there's a packages directory below media
-					string packagesDirectory = IO.SystemDirectories.Media + "/created-packages";
+					string packagesDirectory = SystemDirectories.Media + "/created-packages";
 					if (!System.IO.Directory.Exists(IOHelper.MapPath(packagesDirectory)))
 						System.IO.Directory.CreateDirectory(IOHelper.MapPath(packagesDirectory));
 
diff --git a/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs b/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs
index 94c523aeab..5351bda083 100644
--- a/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs
+++ b/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Umbraco.Core.Logging;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.cms.businesslogic.packager {
     public class InstalledPackage
diff --git a/src/umbraco.cms/businesslogic/Packager/PackageInstance/utill.cs b/src/umbraco.cms/businesslogic/Packager/PackageInstance/utill.cs
index 29d1f07b3e..fdebbc8e3c 100644
--- a/src/umbraco.cms/businesslogic/Packager/PackageInstance/utill.cs
+++ b/src/umbraco.cms/businesslogic/Packager/PackageInstance/utill.cs
@@ -18,7 +18,7 @@ using umbraco.cms.businesslogic.template;
 using umbraco.cms.businesslogic.web;
 using umbraco.cms.businesslogic.macro;
 using ICSharpCode.SharpZipLib.Zip;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.cms.businesslogic.packager {
     /// <summary>
diff --git a/src/umbraco.cms/businesslogic/Packager/Repositories/Repository.cs b/src/umbraco.cms/businesslogic/Packager/Repositories/Repository.cs
index e7f3f91b47..f185e7e99d 100644
--- a/src/umbraco.cms/businesslogic/Packager/Repositories/Repository.cs
+++ b/src/umbraco.cms/businesslogic/Packager/Repositories/Repository.cs
@@ -5,7 +5,7 @@ using System.Xml;
 using System.IO;
 using System.Net;
 using Umbraco.Core.Logging;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.cms.businesslogic.packager.repositories {
     public class Repository {
diff --git a/src/umbraco.cms/businesslogic/Packager/Settings.cs b/src/umbraco.cms/businesslogic/Packager/Settings.cs
index 67651e087b..e8136fc95e 100644
--- a/src/umbraco.cms/businesslogic/Packager/Settings.cs
+++ b/src/umbraco.cms/businesslogic/Packager/Settings.cs
@@ -8,7 +8,7 @@ using System.Web.UI.WebControls;
 using System.Web.UI.WebControls.WebParts;
 using System.Web.UI.HtmlControls;
 using System.IO;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.cms.businesslogic.packager
 {
diff --git a/src/umbraco.cms/businesslogic/Packager/data.cs b/src/umbraco.cms/businesslogic/Packager/data.cs
index ceae03b0c3..6f0df33b4d 100644
--- a/src/umbraco.cms/businesslogic/Packager/data.cs
+++ b/src/umbraco.cms/businesslogic/Packager/data.cs
@@ -4,6 +4,7 @@ using System.Xml.XPath;
 using System.Collections.Generic;
 using System.IO;
 using Umbraco.Core;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 
 namespace umbraco.cms.businesslogic.packager
@@ -25,17 +26,17 @@ namespace umbraco.cms.businesslogic.packager
             //do some error checking and create the folders/files if they don't exist
             if (!File.Exists(dataSource))
             {
-                if (!Directory.Exists(IO.IOHelper.MapPath(Settings.PackagerRoot)))
+                if (!Directory.Exists(IOHelper.MapPath(Settings.PackagerRoot)))
                 {
-                    Directory.CreateDirectory(IO.IOHelper.MapPath(Settings.PackagerRoot));
+                    Directory.CreateDirectory(IOHelper.MapPath(Settings.PackagerRoot));
                 }
-                if (!Directory.Exists(IO.IOHelper.MapPath(Settings.PackagesStorage)))
+                if (!Directory.Exists(IOHelper.MapPath(Settings.PackagesStorage)))
                 {
-                    Directory.CreateDirectory(IO.IOHelper.MapPath(Settings.PackagesStorage));
+                    Directory.CreateDirectory(IOHelper.MapPath(Settings.PackagesStorage));
                 }
-                if (!Directory.Exists(IO.IOHelper.MapPath(Settings.InstalledPackagesStorage)))
+                if (!Directory.Exists(IOHelper.MapPath(Settings.InstalledPackagesStorage)))
                 {
-                    Directory.CreateDirectory(IO.IOHelper.MapPath(Settings.InstalledPackagesStorage));
+                    Directory.CreateDirectory(IOHelper.MapPath(Settings.InstalledPackagesStorage));
                 }
 
                 StreamWriter sw = File.CreateText(dataSource);
diff --git a/src/umbraco.cms/businesslogic/skinning/Skin.cs b/src/umbraco.cms/businesslogic/skinning/Skin.cs
index 82f493798f..97e392ca1e 100644
--- a/src/umbraco.cms/businesslogic/skinning/Skin.cs
+++ b/src/umbraco.cms/businesslogic/skinning/Skin.cs
@@ -5,6 +5,7 @@ using System.Text;
 using System.Xml;
 using System.IO;
 using System.Xml.XPath;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using umbraco.interfaces.skinning;
 
@@ -99,7 +100,7 @@ namespace umbraco.cms.businesslogic.skinning
 
         public static Skin CreateFromAlias(string alias)
         {
-            string manifest = Path.Combine(IO.IOHelper.MapPath( IO.SystemDirectories.Masterpages + "/" + alias), "skin.xml");
+            string manifest = Path.Combine(IOHelper.MapPath( SystemDirectories.Masterpages + "/" + alias), "skin.xml");
             return CreateFromFile(manifest);
         }
 
@@ -115,12 +116,12 @@ namespace umbraco.cms.businesslogic.skinning
         }
         public bool OverridesTemplates()
         {
-            return (System.IO.Directory.GetFiles(IO.IOHelper.MapPath(SkinFolder), "*.master").Count() > 0);
+            return (System.IO.Directory.GetFiles(IOHelper.MapPath(SkinFolder), "*.master").Count() > 0);
         }
 
         public bool HasBackupFiles()
         {
-            return System.IO.Directory.Exists( IO.IOHelper.MapPath(SkinBackupFolder) );
+            return System.IO.Directory.Exists( IOHelper.MapPath(SkinBackupFolder) );
         }
         
 
@@ -222,24 +223,24 @@ namespace umbraco.cms.businesslogic.skinning
 
         public void DeployTemplateFiles()
         {
-            DeployTemplateFiles(IO.SystemDirectories.Masterpages);
+            DeployTemplateFiles(SystemDirectories.Masterpages);
         }
 
 
         public void DeployTemplateFiles(string folder)
         {
-            string[] masterFiles = System.IO.Directory.GetFiles(IO.IOHelper.MapPath(SkinFolder), "*.master");
+            string[] masterFiles = System.IO.Directory.GetFiles(IOHelper.MapPath(SkinFolder), "*.master");
 
             if (masterFiles.Count() > 0)
             {
-                if (!System.IO.Directory.Exists(IO.IOHelper.MapPath(SkinBackupFolder)))
-                    System.IO.Directory.CreateDirectory(IO.IOHelper.MapPath(SkinBackupFolder));
+                if (!System.IO.Directory.Exists(IOHelper.MapPath(SkinBackupFolder)))
+                    System.IO.Directory.CreateDirectory(IOHelper.MapPath(SkinBackupFolder));
 
                 foreach (string master in masterFiles)
                 {
                     FileInfo fi = new FileInfo(master);
-                    string original = Path.Combine(IO.IOHelper.MapPath(IO.SystemDirectories.Masterpages), fi.Name);
-                    string backup = Path.Combine(IO.IOHelper.MapPath(SkinBackupFolder), fi.Name);
+                    string original = Path.Combine(IOHelper.MapPath(SystemDirectories.Masterpages), fi.Name);
+                    string backup = Path.Combine(IOHelper.MapPath(SkinBackupFolder), fi.Name);
 
                     if (System.IO.File.Exists(original))
                         System.IO.File.Copy(original, backup, true);
@@ -251,12 +252,12 @@ namespace umbraco.cms.businesslogic.skinning
 
 
         public void RollbackTemplateFiles(){
-            RollbackTemplateFiles(IO.SystemDirectories.Masterpages);
+            RollbackTemplateFiles(SystemDirectories.Masterpages);
         }
 
         public void RollbackTemplateFiles(string folder)
         {
-            string[] masterFiles = System.IO.Directory.GetFiles(IO.IOHelper.MapPath(SkinFolder), "*.master");
+            string[] masterFiles = System.IO.Directory.GetFiles(IOHelper.MapPath(SkinFolder), "*.master");
 
             //1. take the skin files back into skin folder to store the changes made
             if (masterFiles.Count() > 0)
@@ -264,7 +265,7 @@ namespace umbraco.cms.businesslogic.skinning
                 foreach (string master in masterFiles)
                 {
                     FileInfo fi = new FileInfo(master);
-                    string inUse = Path.Combine(IO.IOHelper.MapPath(IO.SystemDirectories.Masterpages), fi.Name);
+                    string inUse = Path.Combine(IOHelper.MapPath(SystemDirectories.Masterpages), fi.Name);
 
 
                     if (System.IO.File.Exists(inUse))
@@ -274,11 +275,11 @@ namespace umbraco.cms.businesslogic.skinning
 
 
             //2. copy the /backup files back to the masterpages to restore the templates to the way they were before the skin was applied
-            string[] backedUpmasterFiles = System.IO.Directory.GetFiles(IO.IOHelper.MapPath(SkinBackupFolder), "*.master");
+            string[] backedUpmasterFiles = System.IO.Directory.GetFiles(IOHelper.MapPath(SkinBackupFolder), "*.master");
             foreach (string backup in backedUpmasterFiles)
             {
                 FileInfo fi = new FileInfo(backup);
-                string inUse = Path.Combine(IO.IOHelper.MapPath(IO.SystemDirectories.Masterpages), fi.Name);
+                string inUse = Path.Combine(IOHelper.MapPath(SystemDirectories.Masterpages), fi.Name);
 
                 System.IO.File.Copy(backup, inUse, true);
                 System.IO.File.Delete(backup);
@@ -328,7 +329,7 @@ namespace umbraco.cms.businesslogic.skinning
         {
             get
             {
-                return IO.SystemDirectories.Masterpages + "/" + Alias;
+                return SystemDirectories.Masterpages + "/" + Alias;
             }
         }
 
diff --git a/src/umbraco.cms/businesslogic/skinning/tasks/AddStyleSheetToTemplate.cs b/src/umbraco.cms/businesslogic/skinning/tasks/AddStyleSheetToTemplate.cs
index 44f67d4506..a47bb8fe9d 100644
--- a/src/umbraco.cms/businesslogic/skinning/tasks/AddStyleSheetToTemplate.cs
+++ b/src/umbraco.cms/businesslogic/skinning/tasks/AddStyleSheetToTemplate.cs
@@ -1,7 +1,7 @@
 using System;
 using umbraco.interfaces.skinning;
 using HtmlAgilityPack;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.cms.businesslogic.skinning.tasks
 {
@@ -23,7 +23,7 @@ namespace umbraco.cms.businesslogic.skinning.tasks
 
 
             HtmlDocument doc = new HtmlDocument();
-            doc.Load(IO.IOHelper.MapPath(SystemDirectories.Masterpages) + "/" + TargetFile);
+            doc.Load(IOHelper.MapPath(SystemDirectories.Masterpages) + "/" + TargetFile);
 
             //if (doc.DocumentNode.SelectSingleNode(string.Format("//link [@href = '{0}']", Value)) == null)
             //{
@@ -47,7 +47,7 @@ namespace umbraco.cms.businesslogic.skinning.tasks
 
                     target.AppendChild(s);
 
-                    doc.Save(IO.IOHelper.MapPath(SystemDirectories.Masterpages) + "/" + TargetFile);
+                    doc.Save(IOHelper.MapPath(SystemDirectories.Masterpages) + "/" + TargetFile);
 
                     d.TaskExecutionStatus = TaskExecutionStatus.Completed;
                     d.NewValue = Value;
@@ -64,7 +64,7 @@ namespace umbraco.cms.businesslogic.skinning.tasks
         public override TaskExecutionStatus RollBack(string OriginalValue)
         {
             HtmlDocument doc = new HtmlDocument();
-            doc.Load(IO.IOHelper.MapPath(SystemDirectories.Masterpages) + "/" + TargetFile);
+            doc.Load(IOHelper.MapPath(SystemDirectories.Masterpages) + "/" + TargetFile);
 
             HtmlNode s = doc.DocumentNode.SelectSingleNode(string.Format("//link [@href = '{0}']", Value));
 
@@ -72,7 +72,7 @@ namespace umbraco.cms.businesslogic.skinning.tasks
             {
                 s.RemoveAll();
 
-                doc.Save(IO.IOHelper.MapPath(SystemDirectories.Masterpages) + "/" + TargetFile);
+                doc.Save(IOHelper.MapPath(SystemDirectories.Masterpages) + "/" + TargetFile);
 
                 return TaskExecutionStatus.Completed;
             }
diff --git a/src/umbraco.cms/businesslogic/skinning/tasks/ModifyCss.cs b/src/umbraco.cms/businesslogic/skinning/tasks/ModifyCss.cs
index c4fdf5c07b..9698351266 100644
--- a/src/umbraco.cms/businesslogic/skinning/tasks/ModifyCss.cs
+++ b/src/umbraco.cms/businesslogic/skinning/tasks/ModifyCss.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using umbraco.interfaces.skinning;
 using System.IO;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using System.Web;
 
 namespace umbraco.cms.businesslogic.skinning.tasks
@@ -26,7 +26,7 @@ namespace umbraco.cms.businesslogic.skinning.tasks
             TaskExecutionDetails d = new TaskExecutionDetails();
 
             //currently just appending it to the end of the css file
-            StreamWriter sw = File.AppendText(IO.IOHelper.MapPath(SystemDirectories.Css) + "/" + TargetFile);
+            StreamWriter sw = File.AppendText(IOHelper.MapPath(SystemDirectories.Css) + "/" + TargetFile);
             sw.WriteLine(string.Format("{0}{{ {1}:{2};}}", TargetRule, TargetParameter, Value));
             sw.Close();
 
@@ -39,7 +39,7 @@ namespace umbraco.cms.businesslogic.skinning.tasks
 
         public override TaskExecutionStatus RollBack(string OriginalValue)
         {
-            string[] filecontents = File.ReadAllLines(IO.IOHelper.MapPath(SystemDirectories.Css) + "/" + TargetFile);
+            string[] filecontents = File.ReadAllLines(IOHelper.MapPath(SystemDirectories.Css) + "/" + TargetFile);
 
             for (int i = filecontents.Length; i > 0; i--)
             {
@@ -55,7 +55,7 @@ namespace umbraco.cms.businesslogic.skinning.tasks
             foreach (string line in filecontents)
                 s.AppendLine(line);
 
-            System.IO.StreamWriter file = new System.IO.StreamWriter(IO.IOHelper.MapPath(SystemDirectories.Css) + "/" + TargetFile);
+            System.IO.StreamWriter file = new System.IO.StreamWriter(IOHelper.MapPath(SystemDirectories.Css) + "/" + TargetFile);
             file.WriteLine(s.ToString());
 
             file.Close();
diff --git a/src/umbraco.cms/businesslogic/skinning/tasks/ModifyTemplate.cs b/src/umbraco.cms/businesslogic/skinning/tasks/ModifyTemplate.cs
index 7d3d7a7c63..b088a96d4c 100644
--- a/src/umbraco.cms/businesslogic/skinning/tasks/ModifyTemplate.cs
+++ b/src/umbraco.cms/businesslogic/skinning/tasks/ModifyTemplate.cs
@@ -1,6 +1,6 @@
 using System;
 using umbraco.interfaces.skinning;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using HtmlAgilityPack;
 
 namespace umbraco.cms.businesslogic.skinning.tasks
@@ -24,7 +24,7 @@ namespace umbraco.cms.businesslogic.skinning.tasks
             //open template
 
             HtmlDocument doc = new HtmlDocument();
-            doc.Load(IO.IOHelper.MapPath(SystemDirectories.Masterpages) + "/" +TargetFile);
+            doc.Load(IOHelper.MapPath(SystemDirectories.Masterpages) + "/" +TargetFile);
 
             if (doc.DocumentNode.SelectNodes(string.Format("//*[@id = '{0}']", TargetID)) != null)
             {
@@ -49,7 +49,7 @@ namespace umbraco.cms.businesslogic.skinning.tasks
                     }
                 }
             }
-            doc.Save(IO.IOHelper.MapPath(SystemDirectories.Masterpages) + "/" + TargetFile);
+            doc.Save(IOHelper.MapPath(SystemDirectories.Masterpages) + "/" + TargetFile);
 
             d.TaskExecutionStatus = TaskExecutionStatus.Completed;
             d.NewValue = Value;
diff --git a/src/umbraco.cms/businesslogic/translation/Translation.cs b/src/umbraco.cms/businesslogic/translation/Translation.cs
index ab0d0d9482..42ca56c574 100644
--- a/src/umbraco.cms/businesslogic/translation/Translation.cs
+++ b/src/umbraco.cms/businesslogic/translation/Translation.cs
@@ -8,7 +8,7 @@ using umbraco.cms.businesslogic.language;
 using umbraco.cms.businesslogic.property;
 using umbraco.cms.businesslogic.task;
 using umbraco.cms.businesslogic.web;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.cms.businesslogic.translation
 {
diff --git a/src/umbraco.cms/businesslogic/web/Access.cs b/src/umbraco.cms/businesslogic/web/Access.cs
index 64d43c8756..8f0cffd4b2 100644
--- a/src/umbraco.cms/businesslogic/web/Access.cs
+++ b/src/umbraco.cms/businesslogic/web/Access.cs
@@ -6,7 +6,7 @@ using System.Collections;
 using System.IO;
 
 using System.Web.Security;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.cms.businesslogic.web
 {
diff --git a/src/umbraco.cms/businesslogic/web/DocumentVersionList.cs b/src/umbraco.cms/businesslogic/web/DocumentVersionList.cs
index 5709d71295..994f3c3209 100644
--- a/src/umbraco.cms/businesslogic/web/DocumentVersionList.cs
+++ b/src/umbraco.cms/businesslogic/web/DocumentVersionList.cs
@@ -10,7 +10,7 @@ using umbraco.cms.businesslogic.property;
 using umbraco.cms.businesslogic.relation;
 using umbraco.cms.helpers;
 using umbraco.DataLayer;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.cms.businesslogic.web
 {
diff --git a/src/umbraco.cms/businesslogic/workflow/Notification.cs b/src/umbraco.cms/businesslogic/workflow/Notification.cs
index fb98742d31..6302438bf6 100644
--- a/src/umbraco.cms/businesslogic/workflow/Notification.cs
+++ b/src/umbraco.cms/businesslogic/workflow/Notification.cs
@@ -10,7 +10,7 @@ using umbraco.cms.businesslogic.property;
 using umbraco.cms.businesslogic.web;
 using umbraco.DataLayer;
 using umbraco.interfaces;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.cms.businesslogic.workflow
 {
diff --git a/src/umbraco.controls/CodeArea.cs b/src/umbraco.controls/CodeArea.cs
index 370d8a29d9..c22c9dfa0e 100644
--- a/src/umbraco.controls/CodeArea.cs
+++ b/src/umbraco.controls/CodeArea.cs
@@ -11,7 +11,7 @@ using System.Web.UI.HtmlControls;
 using ClientDependency.Core;
 using System.Linq;
 using ClientDependency.Core.Controls;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.uicontrols
 {
diff --git a/src/umbraco.controls/ProgressBar.cs b/src/umbraco.controls/ProgressBar.cs
index 5304e92fb5..2d7c7f13ec 100644
--- a/src/umbraco.controls/ProgressBar.cs
+++ b/src/umbraco.controls/ProgressBar.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Web.UI.WebControls;
+using Umbraco.Core.IO;
 
 namespace umbraco.uicontrols
 {
@@ -17,7 +18,7 @@ namespace umbraco.uicontrols
             if(!string.IsNullOrEmpty(Title))
                 _title = Title;
 
-            base.ImageUrl = IO.SystemDirectories.Umbraco_client + "/images/progressBar.gif";
+            base.ImageUrl = SystemDirectories.UmbracoClient + "/images/progressBar.gif";
             base.AlternateText = _title;
 
             base.Render(writer);
diff --git a/src/umbraco.controls/Splitter.cs b/src/umbraco.controls/Splitter.cs
index 12424c8b61..fb42b00c28 100644
--- a/src/umbraco.controls/Splitter.cs
+++ b/src/umbraco.controls/Splitter.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 using System.Web.UI;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.uicontrols {
     internal class Splitter : System.Web.UI.WebControls.Image {
@@ -9,7 +9,7 @@ namespace umbraco.uicontrols {
             this.Height = System.Web.UI.WebControls.Unit.Pixel(21);
             this.Style.Add("border", "0px");
             this.Attributes.Add("class", "editorIconSplit");
-            this.ImageUrl = SystemDirectories.Umbraco_client + "/menuicon/images/split.gif";
+            this.ImageUrl = SystemDirectories.UmbracoClient + "/menuicon/images/split.gif";
         }
     }
 }
\ No newline at end of file
diff --git a/src/umbraco.controls/TreePicker/BaseTreePicker.cs b/src/umbraco.controls/TreePicker/BaseTreePicker.cs
index a3d4f013b0..bddeffd283 100644
--- a/src/umbraco.controls/TreePicker/BaseTreePicker.cs
+++ b/src/umbraco.controls/TreePicker/BaseTreePicker.cs
@@ -140,7 +140,7 @@ namespace umbraco.uicontrols.TreePicker
                     ModalWidth.ToString(),
                     ModalHeight.ToString(),
                     ShowHeader.ToString().ToLower(),
-                    umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco).TrimEnd('/')
+                    Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco).TrimEnd('/')
                  });
         }
 
diff --git a/src/umbraco.controls/TreeUrlGenerator.cs b/src/umbraco.controls/TreeUrlGenerator.cs
index a136772028..0ca735cb4f 100644
--- a/src/umbraco.controls/TreeUrlGenerator.cs
+++ b/src/umbraco.controls/TreeUrlGenerator.cs
@@ -79,7 +79,7 @@ namespace umbraco.uicontrols
 		/// <returns>Tree service url as a string</returns>
 		public string GetServiceUrl()
 		{
-            return umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/" + GetUrl(TREE_URL);
+            return Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) + "/" + GetUrl(TREE_URL);
 		}
 
 		/// <summary>
@@ -115,7 +115,7 @@ namespace umbraco.uicontrols
 		/// <returns></returns>
 		public string GetInitUrl()
 		{
-            return umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/" + GetUrl(INIT_URL);
+            return Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) + "/" + GetUrl(INIT_URL);
 		}
 
 		/// <summary>
@@ -161,7 +161,7 @@ namespace umbraco.uicontrols
         /// </summary>
         public string GetPickerUrl()
         {
-            return umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/dialogs/" + GetUrl(PICKER_URL);
+            return Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) + "/dialogs/" + GetUrl(PICKER_URL);
         }
 
         [Obsolete("No longer used as useSubModal no longer has any relavence")]
diff --git a/src/umbraco.editorControls/MultiNodeTreePicker/SelectedItemsTemplate.cs b/src/umbraco.editorControls/MultiNodeTreePicker/SelectedItemsTemplate.cs
index 92b999457d..d037544c41 100644
--- a/src/umbraco.editorControls/MultiNodeTreePicker/SelectedItemsTemplate.cs
+++ b/src/umbraco.editorControls/MultiNodeTreePicker/SelectedItemsTemplate.cs
@@ -3,7 +3,7 @@ using System.Web.UI;
 using System.Web.UI.HtmlControls;
 using System.Web.UI.WebControls;
 using umbraco.controls.Images;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.editorControls.MultiNodeTreePicker
 {
diff --git a/src/umbraco.editorControls/XmlData.cs b/src/umbraco.editorControls/XmlData.cs
index 147080e4d2..e8883fec3f 100644
--- a/src/umbraco.editorControls/XmlData.cs
+++ b/src/umbraco.editorControls/XmlData.cs
@@ -1,4 +1,5 @@
 using System.Xml;
+using Umbraco.Core;
 using umbraco.cms.businesslogic.datatype;
 
 namespace umbraco.editorControls
@@ -25,7 +26,7 @@ namespace umbraco.editorControls
         public override XmlNode ToXMl(XmlDocument data)
         {
             // check that the value isn't null and starts with an opening angle-bracket.
-            if (this.Value != null && xmlHelper.CouldItBeXml(this.Value.ToString()))
+            if (this.Value != null && XmlHelper.CouldItBeXml(this.Value.ToString()))
             {
                 // load the value into an XML document.
                 var xd = new XmlDocument();
diff --git a/src/umbraco.editorControls/colorpicker/colorPicker.cs b/src/umbraco.editorControls/colorpicker/colorPicker.cs
index c8a0626917..62bd2ebe67 100644
--- a/src/umbraco.editorControls/colorpicker/colorPicker.cs
+++ b/src/umbraco.editorControls/colorpicker/colorPicker.cs
@@ -3,7 +3,7 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using System.ComponentModel;
 using System.Collections;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using System.Collections.Generic;
 
 namespace umbraco.editorControls
diff --git a/src/umbraco.editorControls/imagecropper/ImageInfo.cs b/src/umbraco.editorControls/imagecropper/ImageInfo.cs
index 8c4ce9fde9..9207a71ed8 100644
--- a/src/umbraco.editorControls/imagecropper/ImageInfo.cs
+++ b/src/umbraco.editorControls/imagecropper/ImageInfo.cs
@@ -3,7 +3,7 @@ using System.Drawing;
 using System.IO;
 using System.Web;
 using umbraco.editorControls.imagecropper;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.editorControls.imagecropper
 {
diff --git a/src/umbraco.editorControls/macrocontainer/Editor.cs b/src/umbraco.editorControls/macrocontainer/Editor.cs
index 5f9c5ae066..35fe7bf1ac 100644
--- a/src/umbraco.editorControls/macrocontainer/Editor.cs
+++ b/src/umbraco.editorControls/macrocontainer/Editor.cs
@@ -12,7 +12,7 @@ using ClientDependency.Core;
 using System.Web;
 using ClientDependency.Core.Controls;
 using umbraco.presentation;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.editorControls.macrocontainer
 {
@@ -49,7 +49,7 @@ namespace umbraco.editorControls.macrocontainer
             {
                 presentation.webservices.ajaxHelpers.EnsureLegacyCalls(base.Page);
                 ScriptManager sm = ScriptManager.GetCurrent(base.Page);
-                ServiceReference webservicePath = new ServiceReference(umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco) + "/webservices/MacroContainerService.asmx");
+                ServiceReference webservicePath = new ServiceReference(Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco) + "/webservices/MacroContainerService.asmx");
 
                 if (!sm.Services.Contains(webservicePath))
                     sm.Services.Add(webservicePath);
diff --git a/src/umbraco.editorControls/relatedlinks/RelatedLinksDataEditor.cs b/src/umbraco.editorControls/relatedlinks/RelatedLinksDataEditor.cs
index f2c50e7818..aad1a2e2ca 100644
--- a/src/umbraco.editorControls/relatedlinks/RelatedLinksDataEditor.cs
+++ b/src/umbraco.editorControls/relatedlinks/RelatedLinksDataEditor.cs
@@ -10,7 +10,7 @@ using umbraco.interfaces;
 using umbraco.editorControls;
 using umbraco.cms.businesslogic;
 using umbraco.cms.businesslogic.datatype;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.editorControls.relatedlinks
 {
diff --git a/src/umbraco.editorControls/simpleEditor/simpleEditor.cs b/src/umbraco.editorControls/simpleEditor/simpleEditor.cs
index 3e0b6ee0b4..8a7843a012 100644
--- a/src/umbraco.editorControls/simpleEditor/simpleEditor.cs
+++ b/src/umbraco.editorControls/simpleEditor/simpleEditor.cs
@@ -3,7 +3,7 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using System.ComponentModel;
 using System.Collections;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.editorControls.simpleEditor
 {
@@ -88,13 +88,13 @@ namespace umbraco.editorControls.simpleEditor
 			output.WriteLine("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr><td>");
 		
 			output.WriteLine(	"<p align=\"right\" style=\"margin: 0px; padding:0px\"><a href=\"javascript:insertLink(document.getElementById('" + this.ClientID + "'))\">" +
-				"<img src=\"" + IOHelper.ResolveUrl(SystemDirectories.Umbraco_client) + "/simpleEditor/images/link.gif\" border=\"0\" align=\"right\" />" +
+				"<img src=\"" + IOHelper.ResolveUrl(SystemDirectories.UmbracoClient) + "/simpleEditor/images/link.gif\" border=\"0\" align=\"right\" />" +
 				"</a>" +
                 "<a href=\"javascript:insertTag(document.getElementById('" + this.ClientID + "'), 'em', '')\">" +
-                "<img src=\"" + IOHelper.ResolveUrl(SystemDirectories.Umbraco_client) + "/simpleEditor/images/italic.gif\" border=\"0\" style=\"margin-left: 3px; margin-right: 3px;\" align=\"right\" />" +
+                "<img src=\"" + IOHelper.ResolveUrl(SystemDirectories.UmbracoClient) + "/simpleEditor/images/italic.gif\" border=\"0\" style=\"margin-left: 3px; margin-right: 3px;\" align=\"right\" />" +
 				"</a>" +
 				" <a href=\"javascript:insertTag(document.getElementById('" + this.ClientID + "'), 'strong', '')\">" +
-                "<img src=\"" + IOHelper.ResolveUrl(SystemDirectories.Umbraco_client) + "/simpleEditor/images/bold.gif\" border=\"0\" align=\"right\" />" +
+                "<img src=\"" + IOHelper.ResolveUrl(SystemDirectories.UmbracoClient) + "/simpleEditor/images/bold.gif\" border=\"0\" align=\"right\" />" +
 				"</a>" +
 				"<br/></p>");
 			base.Render(output);
diff --git a/src/umbraco.editorControls/tinyMCE3/TinyMCE.cs b/src/umbraco.editorControls/tinyMCE3/TinyMCE.cs
index 4244043f03..43f19d4d49 100644
--- a/src/umbraco.editorControls/tinyMCE3/TinyMCE.cs
+++ b/src/umbraco.editorControls/tinyMCE3/TinyMCE.cs
@@ -11,7 +11,7 @@ using umbraco.editorControls.tinymce;
 using umbraco.editorControls.tinyMCE3.webcontrol;
 using umbraco.editorControls.wysiwyg;
 using umbraco.interfaces;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using umbraco.presentation;
 using umbraco.uicontrols;
 
@@ -265,7 +265,7 @@ namespace umbraco.editorControls.tinyMCE3
                         }
                     }
 
-                    //if (HttpContext.Current.Request.Path.IndexOf(umbraco.IO.SystemDirectories.Umbraco) > -1)
+                    //if (HttpContext.Current.Request.Path.IndexOf(Umbraco.Core.IO.SystemDirectories.Umbraco) > -1)
                     //    config.Add("language", User.GetUser(BasePage.GetUserId(BasePage.umbracoUserContextID)).Language);
                     //else
                     //    config.Add("language", System.Threading.Thread.CurrentThread.CurrentCulture.TwoLetterISOLanguageName);
diff --git a/src/umbraco.editorControls/tinyMCE3/webcontrol/plugin/GzipModule.cs b/src/umbraco.editorControls/tinyMCE3/webcontrol/plugin/GzipModule.cs
index c60e67030b..c8da3ea402 100644
--- a/src/umbraco.editorControls/tinyMCE3/webcontrol/plugin/GzipModule.cs
+++ b/src/umbraco.editorControls/tinyMCE3/webcontrol/plugin/GzipModule.cs
@@ -9,7 +9,7 @@ using System;
 using System.Web;
 using System.Text.RegularExpressions;
 using System.IO;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.editorControls.tinyMCE3.webcontrol.plugin
 {
diff --git a/src/umbraco.editorControls/tinymce/tinyMCEConfiguration.cs b/src/umbraco.editorControls/tinymce/tinyMCEConfiguration.cs
index 5e25de43f8..1ff6e3642d 100644
--- a/src/umbraco.editorControls/tinymce/tinyMCEConfiguration.cs
+++ b/src/umbraco.editorControls/tinymce/tinyMCEConfiguration.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Collections;
 using System.Xml;
-using umbraco.IO;
+using Umbraco.Core.IO;
 
 namespace umbraco.editorControls.tinymce
 {
@@ -44,7 +44,7 @@ namespace umbraco.editorControls.tinymce
         }
 
         public static string PluginPath = IOHelper.ResolveUrl( SystemDirectories.Umbraco ) + "/plugins/tinymce3";
-        public static string JavascriptPath = IOHelper.ResolveUrl( SystemDirectories.Umbraco_client ) + "/tinymce3";
+        public static string JavascriptPath = IOHelper.ResolveUrl( SystemDirectories.UmbracoClient ) + "/tinymce3";
 
         private static string _invalidElements;
 
diff --git a/src/umbraco.editorControls/ultimatepicker/ultimatePickerDataEditor.cs b/src/umbraco.editorControls/ultimatepicker/ultimatePickerDataEditor.cs
index ff3d89de26..3155fc7ba5 100644
--- a/src/umbraco.editorControls/ultimatepicker/ultimatePickerDataEditor.cs
+++ b/src/umbraco.editorControls/ultimatepicker/ultimatePickerDataEditor.cs
@@ -409,7 +409,7 @@ namespace umbraco.editorControls.ultimatepicker
             string autoCompleteScript =
                  "jQuery(\"#"
                  + childtxt.ClientID + "\").autocomplete(\""
-                 + umbraco.IO.IOHelper.ResolveUrl(umbraco.IO.SystemDirectories.Umbraco)
+                 + Umbraco.Core.IO.IOHelper.ResolveUrl(Umbraco.Core.IO.SystemDirectories.Umbraco)
                  + "/webservices/UltimatePickerAutoCompleteHandler.ashx\",{minChars: 2,max: 100, extraParams:{id:\"" + parentNodeId.ToString() + "\",showchildren:\"" + config[3] + "\",filter:\"" + config[2] + "\",rnd:\"" + DateTime.Now.Ticks + "\"}});";
 
 
diff --git a/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs b/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs
index 34b4c1b568..096b708804 100644
--- a/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs
+++ b/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs
@@ -13,7 +13,7 @@ using umbraco.DataLayer;
 using umbraco.BusinessLogic;
 
 using umbraco.editorControls;
-using umbraco.IO;
+using Umbraco.Core.IO;
 using System.Collections.Generic;
 using umbraco.cms.businesslogic.datatype;
 
@@ -68,7 +68,7 @@ namespace umbraco.editorControls.userControlGrapper
 
 			// populate the usercontrol dropdown
 			_dropdownlistUserControl.Items.Add(new ListItem(ui.Text("choose"), ""));
-			populateUserControls( IOHelper.MapPath( SystemDirectories.Usercontrols) );
+			populateUserControls( IOHelper.MapPath( SystemDirectories.UserControls) );
 
 		   
 		}
@@ -79,11 +79,11 @@ namespace umbraco.editorControls.userControlGrapper
 
 			foreach (FileInfo uc in di.GetFiles("*.ascx"))
 			{
-                string ucRoot = IOHelper.MapPath(SystemDirectories.Usercontrols);
+                string ucRoot = IOHelper.MapPath(SystemDirectories.UserControls);
 
 				_dropdownlistUserControl.Items.Add(
-					
-					new ListItem( SystemDirectories.Usercontrols +
+
+                    new ListItem(SystemDirectories.UserControls +
                             uc.FullName.Substring(ucRoot.Length).Replace(IOHelper.DirSepChar, '/'))
 
 					/*
diff --git a/src/umbraco.macroRenderings/content.cs b/src/umbraco.macroRenderings/content.cs
index 6f2833b02f..06d71d5a4e 100644
--- a/src/umbraco.macroRenderings/content.cs
+++ b/src/umbraco.macroRenderings/content.cs
@@ -4,7 +4,7 @@ using Microsoft.ApplicationBlocks.Data;
 using System.Data.SqlClient;
 using System.Web.UI;
 using ClientDependency.Core;
-using umbraco.IO;
+
 using umbraco.interfaces;
 using umbraco.uicontrols.TreePicker;
 
diff --git a/src/umbraco.macroRenderings/media.cs b/src/umbraco.macroRenderings/media.cs
index 71755121ff..e447195a69 100644
--- a/src/umbraco.macroRenderings/media.cs
+++ b/src/umbraco.macroRenderings/media.cs
@@ -5,7 +5,6 @@ using System.Data.SqlClient;
 
 using System.Web.UI;
 using ClientDependency.Core;
-using umbraco.IO;
 using umbraco.interfaces;
 using umbraco.uicontrols.TreePicker;