diff --git a/build/Build.proj b/build/Build.proj
index c8da565570..53c9e4b5a0 100644
--- a/build/Build.proj
+++ b/build/Build.proj
@@ -11,8 +11,8 @@
     <UmbracoMSBuildTasksPath>..\UmbracoMSBuildTasks</UmbracoMSBuildTasksPath>
   </PropertyGroup>
   
-  <Import Project="..\lib\Umbraco\UmbracoMSBuildTasks\Umbraco.MSBuild.Tasks.Targets" />
-  <Import Project="..\lib\MSBuild\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets" />
+  <Import Project="..\tools\UmbracoMSBuildTasks\Umbraco.MSBuild.Tasks.Targets" />
+  <Import Project="..\tools\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets" />
 
   <!-- 
   ****************************************************
@@ -39,16 +39,26 @@
     <WebPiFolder>$(BuildFolder)WebPi\</WebPiFolder>
     <SolutionBinFolderRelativeToProjects>$(BuildFolderRelativeToProjects)bin\</SolutionBinFolderRelativeToProjects>
     <SolutionBinFolderAbsolutePath>$(BuildFolderAbsolutePath)bin\</SolutionBinFolderAbsolutePath>
-    <SolutionBinBuildFolderWildcard>$(SolutionBinFolder)**\*.*</SolutionBinBuildFolderWildcard>
-    <SolutionBinBuildFolderExclusionWildcard>$(SolutionBinFolder)**\Web.Template.*;$(SolutionBinFolder)**\*.pdb</SolutionBinBuildFolderExclusionWildcard>
     <WebAppFolderRelativeToProjects>$(BuildFolderRelativeToProjects)WebApp\</WebAppFolderRelativeToProjects>
     <WebAppFolderAbsolutePath>$(BuildFolderAbsolutePath)WebApp\</WebAppFolderAbsolutePath>
     <WebPiFolderRelativeToProjects>$(BuildFolderRelativeToProjects)WebPi\</WebPiFolderRelativeToProjects>
     <WebPiFolderAbsolutePath>$(BuildFolderAbsolutePath)WebPi\</WebPiFolderAbsolutePath>
-    <WebBuildFolderWildcard>$(WebAppFolder)**\*.*</WebBuildFolderWildcard>
-    <WebBuildFolderExclusionWildcard>$(WebAppFolder)**\Web.Template.*;$(WebAppFolder)**\*.pdb</WebBuildFolderExclusionWildcard>
   </PropertyGroup>
 
+  <ItemGroup>
+    <SystemFolders Include="$(WebAppFolder)App_Code" />
+    <SystemFolders Include="$(WebAppFolder)App_Data" />
+    <SystemFolders Include="$(WebAppFolder)App_Data\ClientDependency" />
+    <SystemFolders Include="$(WebAppFolder)App_Data\ExamineIndexes" />
+    <SystemFolders Include="$(WebAppFolder)media" />
+    <SystemFolders Include="$(WebAppFolder)masterpages" />
+    <SystemFolders Include="$(WebAppFolder)scripts" />
+    <SystemFolders Include="$(WebAppFolder)css" />
+    <SystemFolders Include="$(WebAppFolder)macroScripts" />
+    <SystemFolders Include="$(WebAppFolder)xslt" />
+    <SystemFolders Include="$(WebAppFolder)usercontrols" />
+  </ItemGroup>
+
   <!-- 
   ****************************************************
   TARGETS 
@@ -73,12 +83,14 @@
     <MakeDir Directories="$(WebPiFolder)umbraco" />
 
     <!-- Copy fresh built umbraco files -->
-    <ItemGroup>
+    <Exec Command="xcopy %22$(WebAppFolderAbsolutePath)*%22 %22$(WebPiFolderAbsolutePath)umbraco%22 /S /E /Y /I" />
+    
+    <!--<ItemGroup>
       <WebAppFiles Include="$(WebAppFolder)\**\*.*" />
     </ItemGroup>
 
     <Copy SourceFiles="@(WebAppFiles)"
-        DestinationFiles="@(WebAppFiles->'$(WebPiFolder)umbraco\%(RecursiveDir)%(Filename)%(Extension)')" />
+        DestinationFiles="@(WebAppFiles->'$(WebPiFolder)umbraco\%(RecursiveDir)%(Filename)%(Extension)')" />-->
 
     <!-- Copy Web Pi template files -->
     <ItemGroup>
@@ -89,29 +101,24 @@
         DestinationFiles="@(WebPiFiles->'$(WebPiFolder)%(RecursiveDir)%(Filename)%(Extension)')" />
 
     <!-- Zip the files -->
-    <ItemGroup>
-      <WebPiFilesToZip Include="$(WebPiFolder)**\*.*" />
-    </ItemGroup>
-    
-    <MSBuild.Community.Tasks.Zip Files="@(WebPiFilesToZip)" ZipFileName="$(BuildZipFileNameWebPi)" WorkingDirectory="$(WebPiFolder)"  />
+    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameWebPi)%22 %22$(WebPiFolderAbsolutePath)*%22" />
 
   </Target>
   
-  <Target Name="ZipWebApp" DependsOnTargets="CopyLibraries" >
+  <Target Name="ZipWebApp" DependsOnTargets="CreateSystemFolders" >
     
-    <CreateItem Include="$(WebBuildFolderWildcard)" Exclude="$(WebBuildFolderExclusionWildcard)">
-      <Output TaskParameter="Include" ItemName="WebFilesToZip" />
-    </CreateItem>
-
-    <CreateItem Include="$(SolutionBinBuildFolderWildcard)" Exclude="$(SolutionBinBuildFolderExclusionWildcard)">
-      <Output TaskParameter="Include" ItemName="BinFilesToZip" />
-    </CreateItem>
     <Message Text="Starting to zip to $(buildDate)-$(BuildZipFileName)" Importance="high" />
-    <MSBuild.Community.Tasks.Zip Files="@(BinFilesToZip)" ZipFileName="$(BuildZipFileNameBin)" WorkingDirectory="$(SolutionBinFolder)" />
-    <MSBuild.Community.Tasks.Zip Files="@(WebFilesToZip)" ZipFileName="$(BuildZipFileName)" WorkingDirectory="$(WebAppFolder)" />
+
+    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileNameBin)%22 %22$(SolutionBinFolderAbsolutePath)*%22" />
+    <Exec Command="..\tools\7zip\7za.exe a -r %22$(BuildZipFileName)%22 %22$(WebAppFolderAbsolutePath)*%22" />
+    
     <Message Text="Finished zipping to build\$(BuildFolder)\$(buildDate)-$(BuildZipFileName)" Importance="high" />
   </Target>
 
+  <Target Name="CreateSystemFolders" DependsOnTargets="CopyLibraries" Inputs="@(SystemFolders)" Outputs="%(Identity).Dummy">
+    <MakeDir Directories="@(SystemFolders)" />
+  </Target>
+
   <Target Name="CopyLibraries" DependsOnTargets="OffsetTimestamps" >
 
     <!-- Copy SQL CE -->
diff --git a/src/umbraco.presentation/Global.asax b/src/umbraco.presentation/Global.asax
deleted file mode 100644
index a72605dd1a..0000000000
--- a/src/umbraco.presentation/Global.asax
+++ /dev/null
@@ -1 +0,0 @@
-<%@ Application Codebehind="Global.asax.cs" Inherits="umbraco.Global" Language="C#" %>
diff --git a/src/umbraco.presentation/Global.asax.cs b/src/umbraco.presentation/Global.asax.cs
deleted file mode 100644
index aa1ebb664d..0000000000
--- a/src/umbraco.presentation/Global.asax.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Web;
-using System.Threading;
-
-using umbraco.BusinessLogic;
-using umbraco.BusinessLogic.Actions;
-using umbraco.cms.businesslogic.datatype.controls;
-
-namespace umbraco
-{
-	/// <summary>
-	/// Summary description for Global.
-	/// </summary>
-	public class Global : HttpApplication
-	{
-        protected virtual void Application_Start(object sender, EventArgs e)
-        {
-
-        }
-
-        protected virtual void Application_BeginRequest(object sender, EventArgs e)
-        {
-
-        }
-
-        protected virtual void Application_AuthenticateRequest(object sender, EventArgs e)
-        {
-
-        }
-
-        protected virtual void Application_Error(object sender, EventArgs e)
-        {
-
-        }
-
-        protected virtual void Session_End(object sender, EventArgs e)
-        {
-
-        }
-
-		protected virtual void Application_End(Object sender, EventArgs e)
-		{
-            Log.Add(LogTypes.System, BusinessLogic.User.GetUser(0), -1, "Application shut down at " + DateTime.Now);
-		}
-	}
-}
-
diff --git a/tools/7zip/7za.exe b/tools/7zip/7za.exe
new file mode 100644
index 0000000000..7f6bf86bc4
Binary files /dev/null and b/tools/7zip/7za.exe differ
diff --git a/lib/MSBuild/MSBuildCommunityTasks/ICSharpCode.SharpZipLib.dll b/tools/MSBuildCommunityTasks/ICSharpCode.SharpZipLib.dll
similarity index 100%
rename from lib/MSBuild/MSBuildCommunityTasks/ICSharpCode.SharpZipLib.dll
rename to tools/MSBuildCommunityTasks/ICSharpCode.SharpZipLib.dll
diff --git a/lib/MSBuild/MSBuildCommunityTasks/MSBuild.Community.Tasks.Targets b/tools/MSBuildCommunityTasks/MSBuild.Community.Tasks.Targets
similarity index 100%
rename from lib/MSBuild/MSBuildCommunityTasks/MSBuild.Community.Tasks.Targets
rename to tools/MSBuildCommunityTasks/MSBuild.Community.Tasks.Targets
diff --git a/lib/MSBuild/MSBuildCommunityTasks/MSBuild.Community.Tasks.chm b/tools/MSBuildCommunityTasks/MSBuild.Community.Tasks.chm
similarity index 100%
rename from lib/MSBuild/MSBuildCommunityTasks/MSBuild.Community.Tasks.chm
rename to tools/MSBuildCommunityTasks/MSBuild.Community.Tasks.chm
diff --git a/lib/MSBuild/MSBuildCommunityTasks/MSBuild.Community.Tasks.dll b/tools/MSBuildCommunityTasks/MSBuild.Community.Tasks.dll
similarity index 100%
rename from lib/MSBuild/MSBuildCommunityTasks/MSBuild.Community.Tasks.dll
rename to tools/MSBuildCommunityTasks/MSBuild.Community.Tasks.dll
diff --git a/lib/MSBuild/MSBuildCommunityTasks/MSBuild.Community.Tasks.xml b/tools/MSBuildCommunityTasks/MSBuild.Community.Tasks.xml
similarity index 100%
rename from lib/MSBuild/MSBuildCommunityTasks/MSBuild.Community.Tasks.xml
rename to tools/MSBuildCommunityTasks/MSBuild.Community.Tasks.xml
diff --git a/lib/MSBuild/MSBuildCommunityTasks/Sample.proj b/tools/MSBuildCommunityTasks/Sample.proj
similarity index 100%
rename from lib/MSBuild/MSBuildCommunityTasks/Sample.proj
rename to tools/MSBuildCommunityTasks/Sample.proj
diff --git a/lib/Umbraco/UmbracoMSBuildTasks/Umbraco.MSBuild.Tasks.Targets b/tools/UmbracoMSBuildTasks/Umbraco.MSBuild.Tasks.Targets
similarity index 100%
rename from lib/Umbraco/UmbracoMSBuildTasks/Umbraco.MSBuild.Tasks.Targets
rename to tools/UmbracoMSBuildTasks/Umbraco.MSBuild.Tasks.Targets
diff --git a/lib/Umbraco/UmbracoMSBuildTasks/Umbraco.MSBuild.Tasks.dll b/tools/UmbracoMSBuildTasks/Umbraco.MSBuild.Tasks.dll
similarity index 100%
rename from lib/Umbraco/UmbracoMSBuildTasks/Umbraco.MSBuild.Tasks.dll
rename to tools/UmbracoMSBuildTasks/Umbraco.MSBuild.Tasks.dll