diff --git a/.hgignore b/.hgignore
index 1b0df607b..26f8826f4 100644
--- a/.hgignore
+++ b/.hgignore
@@ -21,3 +21,6 @@ glob:*.suo
 glob:src/Orchard.Web/Modules-temp/*
 glob:*.itrace.csdef
 glob:*.build.csdef
+glob:src/Orchard.Azure/Orchard.Azure.Web/Core
+glob:src/Orchard.Azure/Orchard.Azure.Web/Modules
+glob:src/Orchard.Azure/Orchard.Azure.Web/Themes
diff --git a/AzurePackage.proj b/AzurePackage.proj
index 1d2a466f2..1e85b80b3 100644
--- a/AzurePackage.proj
+++ b/AzurePackage.proj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
 <!-- Initialization -->
 
diff --git a/src/Orchard.Azure/Orchard.Azure.Web/CopyModulesAndThemes.proj b/src/Orchard.Azure/Orchard.Azure.Web/CopyModulesAndThemes.proj
new file mode 100644
index 000000000..fe479004f
--- /dev/null
+++ b/src/Orchard.Azure/Orchard.Azure.Web/CopyModulesAndThemes.proj
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Initialization -->
+  
+  <PropertyGroup>
+    <OrchardWebFolder>$(MSBuildProjectDirectory)\..\..\Orchard.Web</OrchardWebFolder>
+    <DestinationFolder>$(MSBuildProjectDirectory)</DestinationFolder>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Excluded Include="$(OrchardWebFolder)\**\bin\**\*;$(OrchardWebFolder)\**\obj\**\*;" />
+    
+    <CoreFiles Include="$(OrchardWebFolder)\Core\**\*" Exclude="@(Excluded)" />
+    <ModulesFiles Include="$(OrchardWebFolder)\Modules\**\*" Exclude="@(Excluded)" />
+    <ThemesFiles Include="$(OrchardWebFolder)\Themes\**\*" Exclude="@(Excluded)" />
+  </ItemGroup>
+  
+  <!-- Coordinating Targets -->
+  
+  <Target Name="Build">
+    <CallTarget Targets="Copyfiles"/>
+  </Target>
+  
+  <Target Name="Clean">
+    <RemoveDir Directories="$(DestinationFolder)\Core;$(DestinationFolder)\Modules;$(DestinationFolder)\Themes" ContinueOnError="true" />
+  </Target>
+  
+  <!-- Work Targets -->
+  
+  <Target Name ="CopyFiles">
+    <Message Text="Copying Core, Modules and Themes folders"/>
+    <Message Text="  Source:      $(OrchardWebFolder)"/>
+    <Message Text="  Destination: $(DestinationFolder)"/>
+    
+    <!-- Note: We use "SkipUnchangedFiles" and "UseHardlinksIfPossible" to try to make things as fast as possible -->
+    <Copy SourceFiles="@(CoreFiles)" DestinationFolder="$(DestinationFolder)\Core\%(RecursiveDir)" SkipUnchangedFiles="True" UseHardlinksIfPossible="True"/>
+    <Copy SourceFiles="@(ModulesFiles)" DestinationFolder="$(DestinationFolder)\Modules\%(RecursiveDir)" SkipUnchangedFiles="True" UseHardlinksIfPossible="True"/>
+    <Copy SourceFiles="@(ThemesFiles)" DestinationFolder="$(DestinationFolder)\Themes\%(RecursiveDir)" SkipUnchangedFiles="True" UseHardlinksIfPossible="True"/>
+    
+    <Message Text="Done copying files."/>
+  </Target>
+  
+</Project>
diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
index 9f81d4831..55bf9ec3d 100644
--- a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
@@ -321,9 +321,12 @@
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target> -->
-  <Target Name="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
+  <Target Name="AfterBuildCompiler" Condition="'$(MvcBuildViews)'=='true'">
     <AspNetCompiler VirtualPath="temp" PhysicalPath="$(ProjectDir)" />
   </Target>
+  <Target Name="AfterBuild" DependsOnTargets="AfterBuildCompiler">
+    <MSBuild Projects="CopyModulesAndThemes.proj" Targets="Build" />
+  </Target>
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">