diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 05eca800e7..0ad3996c92 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -233,7 +233,7 @@
     <Compile Include="..\SolutionInfo.cs">
       <Link>Properties\SolutionInfo.cs</Link>
     </Compile>
-    <Compile Include="EnsureSystemPathsApplicationStartupHandler.cs" />
+    <Compile Include="umbraco.presentation\EnsureSystemPathsApplicationStartupHandler.cs" />
     <Compile Include="umbraco.presentation\install\steps\database.ascx.cs">
       <DependentUpon>database.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -285,18 +285,18 @@
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="BasePageExtensions.cs" />
-    <Compile Include="content.cs">
+    <Compile Include="umbraco.presentation\BasePageExtensions.cs" />
+    <Compile Include="umbraco.presentation\content.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="default.aspx.cs">
+    <Compile Include="umbraco.presentation\default.aspx.cs">
       <DependentUpon>default.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="default.aspx.designer.cs">
+    <Compile Include="umbraco.presentation\default.aspx.designer.cs">
       <DependentUpon>default.aspx</DependentUpon>
     </Compile>
-    <Compile Include="helper.cs">
+    <Compile Include="umbraco.presentation\helper.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="umbraco.presentation\install\default.aspx.cs">
@@ -355,17 +355,17 @@
     <Compile Include="umbraco.presentation\install\Title.ascx.designer.cs">
       <DependentUpon>Title.ascx</DependentUpon>
     </Compile>
-    <Compile Include="item.cs">
+    <Compile Include="umbraco.presentation\item.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="keepAliveService.cs">
+    <Compile Include="umbraco.presentation\keepAliveService.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="library.cs">
+    <Compile Include="umbraco.presentation\library.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="macro.cs" />
-    <Compile Include="page.cs">
+    <Compile Include="umbraco.presentation\macro.cs" />
+    <Compile Include="umbraco.presentation\page.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\Settings1.Designer.cs">
@@ -373,21 +373,21 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
-    <Compile Include="publishingService.cs">
+    <Compile Include="umbraco.presentation\publishingService.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="PublishQueue.cs" />
-    <Compile Include="python.cs" />
-    <Compile Include="requestHandler.cs">
+    <Compile Include="umbraco.presentation\PublishQueue.cs" />
+    <Compile Include="umbraco.presentation\python.cs" />
+    <Compile Include="umbraco.presentation\requestHandler.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="requestModule.cs">
+    <Compile Include="umbraco.presentation\requestModule.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="showField.cs">
+    <Compile Include="umbraco.presentation\showField.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="template.cs">
+    <Compile Include="umbraco.presentation\template.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="umbraco.presentation\umbracobase\attributes\RestExtension.cs" />
@@ -395,20 +395,20 @@
     <Compile Include="umbraco.presentation\umbracobase\baseHttpModule.cs" />
     <Compile Include="umbraco.presentation\umbracobase\baseLibrary.cs" />
     <Compile Include="umbraco.presentation\umbracobase\restExtension.cs" />
-    <Compile Include="UmbracoContext.cs" />
-    <Compile Include="UmbracoPage.cs">
+    <Compile Include="umbraco.presentation\UmbracoContext.cs" />
+    <Compile Include="umbraco.presentation\UmbracoPage.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="umbracoPageHolder.cs">
+    <Compile Include="umbraco.presentation\umbracoPageHolder.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UmbracoRequest.cs">
+    <Compile Include="umbraco.presentation\UmbracoRequest.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UmbracoResponse.cs">
+    <Compile Include="umbraco.presentation\UmbracoResponse.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UmbracoServerUtility.cs" />
+    <Compile Include="umbraco.presentation\UmbracoServerUtility.cs" />
     <Compile Include="umbraco.presentation\umbraco\ActionHandlers\umbEnsureUniqueName.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -1737,7 +1737,7 @@
     <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\SpellChecker.cs" />
     <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\SpellCheckerInput.cs" />
     <Compile Include="umbraco.presentation\umbraco\plugins\tinymce3\SpellCheckerResult.cs" />
-    <Compile Include="viewstateMoverModule.cs" />
+    <Compile Include="umbraco.presentation\viewstateMoverModule.cs" />
     <Compile Include="Web References\org.umbraco.update\Reference.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -1793,7 +1793,7 @@
     <Content Include="umbraco.presentation\umbraco\controls\Images\UploadMediaImage.ascx" />
     <Content Include="umbraco.presentation\umbraco\controls\Tree\TreeControl.ascx" />
     <Content Include="umbraco.presentation\umbraco\Search\QuickSearch.ascx" />
-    <Content Include="default.aspx" />
+    <Content Include="umbraco.presentation\default.aspx" />
     <Content Include="umbraco.presentation\install\default.aspx" />
     <Content Include="umbraco.presentation\install\steps\license.ascx" />
     <Content Include="umbraco.presentation\umbraco\actions\delete.aspx" />
diff --git a/src/Umbraco.Web/BasePageExtensions.cs b/src/Umbraco.Web/umbraco.presentation/BasePageExtensions.cs
similarity index 100%
rename from src/Umbraco.Web/BasePageExtensions.cs
rename to src/Umbraco.Web/umbraco.presentation/BasePageExtensions.cs
diff --git a/src/Umbraco.Web/EnsureSystemPathsApplicationStartupHandler.cs b/src/Umbraco.Web/umbraco.presentation/EnsureSystemPathsApplicationStartupHandler.cs
similarity index 100%
rename from src/Umbraco.Web/EnsureSystemPathsApplicationStartupHandler.cs
rename to src/Umbraco.Web/umbraco.presentation/EnsureSystemPathsApplicationStartupHandler.cs
diff --git a/src/Umbraco.Web/PublishQueue.cs b/src/Umbraco.Web/umbraco.presentation/PublishQueue.cs
similarity index 100%
rename from src/Umbraco.Web/PublishQueue.cs
rename to src/Umbraco.Web/umbraco.presentation/PublishQueue.cs
diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/umbraco.presentation/UmbracoContext.cs
similarity index 100%
rename from src/Umbraco.Web/UmbracoContext.cs
rename to src/Umbraco.Web/umbraco.presentation/UmbracoContext.cs
diff --git a/src/Umbraco.Web/UmbracoPage.cs b/src/Umbraco.Web/umbraco.presentation/UmbracoPage.cs
similarity index 100%
rename from src/Umbraco.Web/UmbracoPage.cs
rename to src/Umbraco.Web/umbraco.presentation/UmbracoPage.cs
diff --git a/src/Umbraco.Web/UmbracoRequest.cs b/src/Umbraco.Web/umbraco.presentation/UmbracoRequest.cs
similarity index 100%
rename from src/Umbraco.Web/UmbracoRequest.cs
rename to src/Umbraco.Web/umbraco.presentation/UmbracoRequest.cs
diff --git a/src/Umbraco.Web/UmbracoResponse.cs b/src/Umbraco.Web/umbraco.presentation/UmbracoResponse.cs
similarity index 100%
rename from src/Umbraco.Web/UmbracoResponse.cs
rename to src/Umbraco.Web/umbraco.presentation/UmbracoResponse.cs
diff --git a/src/Umbraco.Web/UmbracoServerUtility.cs b/src/Umbraco.Web/umbraco.presentation/UmbracoServerUtility.cs
similarity index 100%
rename from src/Umbraco.Web/UmbracoServerUtility.cs
rename to src/Umbraco.Web/umbraco.presentation/UmbracoServerUtility.cs
diff --git a/src/Umbraco.Web/content.cs b/src/Umbraco.Web/umbraco.presentation/content.cs
similarity index 100%
rename from src/Umbraco.Web/content.cs
rename to src/Umbraco.Web/umbraco.presentation/content.cs
diff --git a/src/Umbraco.Web/default.aspx b/src/Umbraco.Web/umbraco.presentation/default.aspx
similarity index 100%
rename from src/Umbraco.Web/default.aspx
rename to src/Umbraco.Web/umbraco.presentation/default.aspx
diff --git a/src/Umbraco.Web/default.aspx.cs b/src/Umbraco.Web/umbraco.presentation/default.aspx.cs
similarity index 100%
rename from src/Umbraco.Web/default.aspx.cs
rename to src/Umbraco.Web/umbraco.presentation/default.aspx.cs
diff --git a/src/Umbraco.Web/default.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/default.aspx.designer.cs
similarity index 100%
rename from src/Umbraco.Web/default.aspx.designer.cs
rename to src/Umbraco.Web/umbraco.presentation/default.aspx.designer.cs
diff --git a/src/Umbraco.Web/helper.cs b/src/Umbraco.Web/umbraco.presentation/helper.cs
similarity index 100%
rename from src/Umbraco.Web/helper.cs
rename to src/Umbraco.Web/umbraco.presentation/helper.cs
diff --git a/src/Umbraco.Web/item.cs b/src/Umbraco.Web/umbraco.presentation/item.cs
similarity index 100%
rename from src/Umbraco.Web/item.cs
rename to src/Umbraco.Web/umbraco.presentation/item.cs
diff --git a/src/Umbraco.Web/keepAliveService.cs b/src/Umbraco.Web/umbraco.presentation/keepAliveService.cs
similarity index 100%
rename from src/Umbraco.Web/keepAliveService.cs
rename to src/Umbraco.Web/umbraco.presentation/keepAliveService.cs
diff --git a/src/Umbraco.Web/library.cs b/src/Umbraco.Web/umbraco.presentation/library.cs
similarity index 100%
rename from src/Umbraco.Web/library.cs
rename to src/Umbraco.Web/umbraco.presentation/library.cs
diff --git a/src/Umbraco.Web/macro.cs b/src/Umbraco.Web/umbraco.presentation/macro.cs
similarity index 100%
rename from src/Umbraco.Web/macro.cs
rename to src/Umbraco.Web/umbraco.presentation/macro.cs
diff --git a/src/Umbraco.Web/page.cs b/src/Umbraco.Web/umbraco.presentation/page.cs
similarity index 100%
rename from src/Umbraco.Web/page.cs
rename to src/Umbraco.Web/umbraco.presentation/page.cs
diff --git a/src/Umbraco.Web/publishingService.cs b/src/Umbraco.Web/umbraco.presentation/publishingService.cs
similarity index 100%
rename from src/Umbraco.Web/publishingService.cs
rename to src/Umbraco.Web/umbraco.presentation/publishingService.cs
diff --git a/src/Umbraco.Web/python.cs b/src/Umbraco.Web/umbraco.presentation/python.cs
similarity index 100%
rename from src/Umbraco.Web/python.cs
rename to src/Umbraco.Web/umbraco.presentation/python.cs
diff --git a/src/Umbraco.Web/requestHandler.cs b/src/Umbraco.Web/umbraco.presentation/requestHandler.cs
similarity index 100%
rename from src/Umbraco.Web/requestHandler.cs
rename to src/Umbraco.Web/umbraco.presentation/requestHandler.cs
diff --git a/src/Umbraco.Web/requestModule.cs b/src/Umbraco.Web/umbraco.presentation/requestModule.cs
similarity index 100%
rename from src/Umbraco.Web/requestModule.cs
rename to src/Umbraco.Web/umbraco.presentation/requestModule.cs
diff --git a/src/Umbraco.Web/showField.cs b/src/Umbraco.Web/umbraco.presentation/showField.cs
similarity index 100%
rename from src/Umbraco.Web/showField.cs
rename to src/Umbraco.Web/umbraco.presentation/showField.cs
diff --git a/src/Umbraco.Web/template.cs b/src/Umbraco.Web/umbraco.presentation/template.cs
similarity index 100%
rename from src/Umbraco.Web/template.cs
rename to src/Umbraco.Web/umbraco.presentation/template.cs
diff --git a/src/Umbraco.Web/umbracoPageHolder.cs b/src/Umbraco.Web/umbraco.presentation/umbracoPageHolder.cs
similarity index 100%
rename from src/Umbraco.Web/umbracoPageHolder.cs
rename to src/Umbraco.Web/umbraco.presentation/umbracoPageHolder.cs
diff --git a/src/Umbraco.Web/viewstateMoverModule.cs b/src/Umbraco.Web/umbraco.presentation/viewstateMoverModule.cs
similarity index 100%
rename from src/Umbraco.Web/viewstateMoverModule.cs
rename to src/Umbraco.Web/umbraco.presentation/viewstateMoverModule.cs