diff --git a/.hgignore b/.hgignore
index 2df2be58c..41d9fcd05 100644
--- a/.hgignore
+++ b/.hgignore
@@ -7,6 +7,7 @@ glob:*.user
 glob:*.patch
 glob:*.hg
 glob:build
+glob:buildtasks
 glob:artifacts
 glob:*.sln.cache
 glob:src/Orchard.Web/Media/*
diff --git a/Orchard.proj b/Orchard.proj
index f54f7dfa0..6a8de076f 100644
--- a/Orchard.proj
+++ b/Orchard.proj
@@ -7,6 +7,7 @@
     <LibFolder>$(MSBuildProjectDirectory)\lib</LibFolder>
     <SrcFolder>$(MSBuildProjectDirectory)\src</SrcFolder>
     <BuildFolder>$(MSBuildProjectDirectory)\build</BuildFolder>
+    <MsBuildTasksFolder>$(MSBuildProjectDirectory)\buildtasks</MsBuildTasksFolder>
     <ArtifactsFolder>$(MSBuildProjectDirectory)\artifacts</ArtifactsFolder>
     <SqlCeFolder>$(MSBuildProjectDirectory)\lib\sqlce</SqlCeFolder>
     <SourceArtifactFolder>$(ArtifactsFolder)\Source</SourceArtifactFolder>
@@ -37,15 +38,6 @@
     <CallTarget Targets="Package"/>
   </Target>
 
-  <Target Name ="BuildWithVersion">
-    <CallTarget Targets="Clean"/>
-    <CallTarget Targets="SetVersion"/>
-    <CallTarget Targets="Compile"/>
-    <CallTarget Targets="Test"/>
-    <CallTarget Targets="Package"/>
-  </Target>
-
-
   <Target Name="Package">
     <CallTarget Targets="Package-Stage"/>
     <CallTarget Targets="Package-MsDeploy"/>
@@ -70,8 +62,6 @@
   </Target>
 
   <Target Name ="Compile">
-    <CallTarget Targets="CompileMsBuildTasks"/>
-
     <MSBuild
       Projects="$(SrcFolder)\Orchard.sln"
       Targets="Build"
@@ -82,10 +72,9 @@
     <MSBuild
       Projects="$(SrcFolder)\Tools\MSBuild.Orchard.Tasks\MSBuild.Orchard.Tasks.csproj"
       Targets="Build"
-      Properties="Configuration=Release;OutputPath=$(CompileFolder)" />
+      Properties="Configuration=Release;OutputPath=$(MsBuildTasksFolder)" />
   </Target>
 
-
   <!-- Testing -->
 
   <Target Name ="Test">
@@ -112,11 +101,13 @@
 
   <!-- Packaging (Stage) -->
 
-  <UsingTask AssemblyFile="$(CompileFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.StageProjectAlteration" />
-  <UsingTask AssemblyFile="$(CompileFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.FilterModuleBinaries" />
-  <UsingTask AssemblyFile="$(CompileFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.FileUpdateLines" />
+  <UsingTask AssemblyFile="$(MsBuildTasksFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.StageProjectAlteration" />
+  <UsingTask AssemblyFile="$(MsBuildTasksFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.FilterModuleBinaries" />
+  <UsingTask AssemblyFile="$(MsBuildTasksFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.FileUpdateLines" />
 
   <Target Name="Package-Stage">
+    <CallTarget Targets="CompileMsBuildTasks"/>
+    
     <ItemGroup>
       <SqlCe-Native-Binaries-x86 Include="$(SqlCeFolder)\x86\*"/>
       <SqlCe-Native-Binaries-amd64 Include="$(SqlCeFolder)\amd64\*"/>
@@ -252,6 +243,7 @@
   <!-- Update all AssemblyInfo.cs and module.txt files to contain $(Version) -->
   <Target Name="SetVersion" Condition="$(Version) != ''">
     <CallTarget Targets="CompileMsBuildTasks"/>
+    
     <ItemGroup>
       <Version-AssemblyInfos Include="$(SrcFolder)\**\AssemblyInfo.cs" />
       <Version-Modules Include="$(SrcFolder)\**\Module.txt" />