diff --git a/build/Build.proj b/build/Build.proj
index 37aecbc660..cb0f7c5ce2 100644
--- a/build/Build.proj
+++ b/build/Build.proj
@@ -6,11 +6,11 @@
   <!--<Import Project="..\lib\References\Umbraco\UmbracoMSBuildTasks\Umbraco.MSBuild.Tasks.Targets" />-->
   <Import Project="..\lib\MSBuild\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets" />
   <PropertyGroup>
-    <BuildFolder>build\_BuildOutput\</BuildFolder>
+    <BuildFolder>_BuildOutput\</BuildFolder>
     <BuildZipFileName>UmbracoWebApp.zip</BuildZipFileName>
     <BuildZipFileNameBin>UmbracoAllBinaries.zip</BuildZipFileNameBin>
     <IncludeSymbols>False</IncludeSymbols>
-    <BuildFolderRelativeToProjects>..\..\$(BuildFolder)</BuildFolderRelativeToProjects>
+    <BuildFolderRelativeToProjects>..\..\build\$(BuildFolder)</BuildFolderRelativeToProjects>
     <SolutionBinFolder>$(BuildFolder)bin\</SolutionBinFolder>
     <WebAppFolder>$(BuildFolder)WebApp\</WebAppFolder>
     <SolutionBinFolderRelativeToProjects>$(BuildFolderRelativeToProjects)bin\</SolutionBinFolderRelativeToProjects>
@@ -28,32 +28,39 @@
   </Target>
   <Target Name="CleanUp" DependsOnTargets="ZipWebApp">
     <Message Text="Deleting $(BuildFolder)" Importance="high" />
-    <RemoveDir Directories="$(BuildFolder)" />
+    <RemoveDir Directories="build\$(BuildFolder)" />
     <Message Text="Finished deleting $(BuildFolder)" Importance="high" />
   </Target>
   <!--<Target Name="ZipWebApp" DependsOnTargets="OffsetTimestamps">-->
-  <Target Name="ZipWebApp" >
+  <Target Name="ZipWebApp" DependsOnTargets="CompileWeb" >
     <Time Format="yyyyMMdd-HHmm">
       <Output TaskParameter="FormattedTime" PropertyName="buildDate" />
     </Time>
+
+    <!--<Message Text=" Here I Am  " />
+    <Exec Command="dir ." />
+    <Message Text=" " />
+    <Message Text="FOLDER = $(WebBuildFolderWildcard)" Importance="high" />-->
+    
     <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="$(buildDate)-$(BuildZipFileNameBin)" WorkingDirectory="$(SolutionBinFolder)" />
     <MSBuild.Community.Tasks.Zip Files="@(WebFilesToZip)" ZipFileName="$(buildDate)-$(BuildZipFileName)" WorkingDirectory="$(WebAppFolder)" />
-    <Message Text="Finished zipping to $(BuildFolder)\$(buildDate)-$(BuildZipFileName)" Importance="high" />
+    <Message Text="Finished zipping to build\$(BuildFolder)\$(buildDate)-$(BuildZipFileName)" Importance="high" />
   </Target>
   <Target Name="CompileWeb">
 
-    <Message Text="Compiling web project to $(BuildFolder)" Importance="high" />
+    <Message Text="Compiling web project to build\$(BuildFolder)" Importance="high" />
     <!-- For UseWPP_CopyWebApplication=True see http://stackoverflow.com/questions/1983575/copywebapplication-with-web-config-transformations -->
     <MSBuild Projects="..\src\umbraco.sln" Properties="Configuration=Debug;UseWPP_CopyWebApplication=True;PipelineDependsOnBuild=False;OutDir=$(SolutionBinFolderRelativeToProjects);WebProjectOutputDir=$(WebAppFolderRelativeToProjects)" Targets="Clean;Build;" BuildInParallel="False" ToolsVersion="4.0" UnloadProjectsOnCompletion="False">
     </MSBuild>
-    <Message Text="Finished compiling web project to $(BuildFolder)" Importance="high" />
+    <Message Text="Finished compiling web project to build\$(BuildFolder)" Importance="high" />
   </Target>
   <!--<Target Name="CopyDefaultPlugins" DependsOnTargets="CompileWeb">
 		<Message Text="Copying default plugins using $(WebProjectPluginFolderWildcard)" Importance="high" />
diff --git a/lib/MSBuild/MSBuildCommunityTasks/MSBuild.Community.Tasks.Targets b/lib/MSBuild/MSBuildCommunityTasks/MSBuild.Community.Tasks.Targets
index ba10f25695..d90cb5b6f7 100644
--- a/lib/MSBuild/MSBuildCommunityTasks/MSBuild.Community.Tasks.Targets
+++ b/lib/MSBuild/MSBuildCommunityTasks/MSBuild.Community.Tasks.Targets
@@ -3,7 +3,7 @@
   <!-- $Id: MSBuild.Community.Tasks.Targets 303 2007-02-23 15:49:46Z pwelter34 $ -->
 
   <PropertyGroup>
-    <MSBuildCommunityTasksPath Condition="'$(MSBuildCommunityTasksPath)' == ''">$(ProjectDir)..\..\foreign dlls\MSBuild\MSBuildCommunityTasks</MSBuildCommunityTasksPath>
+    <MSBuildCommunityTasksPath Condition="'$(MSBuildCommunityTasksPath)' == ''">$(MSBuildExtensionsPath)\MSBuildCommunityTasks</MSBuildCommunityTasksPath>
     <MSBuildCommunityTasksLib>$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.dll</MSBuildCommunityTasksLib>
   </PropertyGroup>