diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 84d60e4fd4..0053fe6ef5 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -19,8 +19,6 @@
         </dependencies>
     </metadata>
   <files>
-	<file src="..\_BuildOutput\WebApp\bin\amd64\**" target="Content\bin\amd64" />
-	<file src="..\_BuildOutput\WebApp\bin\x86\**" target="Content\bin\x86" />
 	<file src="..\_BuildOutput\Configs\**" target="Content\config" exclude="..\_BuildOutput\Configs\Web.config.transform" />
 	<file src="..\_BuildOutput\WebApp\css\**" target="Content\css" />
 	<file src="..\_BuildOutput\WebApp\macroScripts\**" target="Content\macroScripts" exclude="..\_BuildOutput\WebApp\macroScripts\Web.config" />
@@ -34,9 +32,8 @@
 	<file src="..\_BuildOutput\WebApp\Web.config" target="Content\Web.config" />
 	<file src="..\_BuildOutput\WebApp\Global.asax" target="Content\Global.asax" />
 	<file src="..\_BuildOutput\WebApp\App_Browsers\**" target="UmbracoFiles\App_Browsers" />
-	<file src="..\_BuildOutput\WebApp\App_Code\**" target="UmbracoFiles\App_Code" />
-	<file src="..\_BuildOutput\WebApp\App_Data\**" target="UmbracoFiles\App_Data" />
-	<file src="..\_BuildOutput\WebApp\App_Plugins\**" target="UmbracoFiles\App_Plugins" />
+	<file src="..\_BuildOutput\WebApp\bin\amd64\**" target="UmbracoFiles\bin\amd64" />
+	<file src="..\_BuildOutput\WebApp\bin\x86\**" target="UmbracoFiles\bin\x86" />
 	<file src="..\_BuildOutput\WebApp\config\splashes\**" target="UmbracoFiles\config\splashes" />
 	<file src="..\_BuildOutput\WebApp\install\**" target="UmbracoFiles\install" />
 	<file src="..\_BuildOutput\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
diff --git a/build/NuSpecs/build/net40/UmbracoCms.targets b/build/NuSpecs/build/net40/UmbracoCms.targets
index f4fb27ba8c..0a172d4d90 100644
--- a/build/NuSpecs/build/net40/UmbracoCms.targets
+++ b/build/NuSpecs/build/net40/UmbracoCms.targets
@@ -1,28 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
+	<ItemGroup>
+	  <AppBrowsersFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\App_Browsers\**\*" />
+	  <SplashesFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\Config\Splashes\**\*;" />
+	  <SqlCeBinFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\bin\**\*;" />
+      <UmbracoFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\umbraco\**\*;" />
+      <UmbracoClientFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\umbraco_client\**\*;" />
+    </ItemGroup>
+	<Copy SourceFiles="%(AppBrowsersFiles.FullPath)"
+          DestinationFiles="App_Browsers\%(RecursiveDir)%(Filename)%(Extension)"
+          Condition="!Exists('App_Browsers\%(RecursiveDir)%(Filename)%(Extension)')" />
+	<Copy SourceFiles="%(SplashesFiles.FullPath)"
+          DestinationFiles="Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)"
+          Condition="!Exists('Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)')" />
+	<Copy SourceFiles="%(SqlCeBinFiles.FullPath)"
+          DestinationFiles="bin\%(RecursiveDir)%(Filename)%(Extension)"
+          Condition="!Exists('bin\%(RecursiveDir)%(Filename)%(Extension)')" />
+	<Copy SourceFiles="%(UmbracoFiles.FullPath)"
+          DestinationFiles="umbraco\%(RecursiveDir)%(Filename)%(Extension)"
+          Condition="!Exists('umbraco\%(RecursiveDir)%(Filename)%(Extension)')" />
+	<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
+          DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
+          Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
+  </Target>
   <Target Name="AddUmbracoFilesToOutput">
     <ItemGroup>
+      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
+	  <AppCodeFiles Include=".\App_Code\**\*" />
+	  <AppPluginsFiles Include=".\App_Plugins\**\*" />
+	  <GlobalAsaxFile Include=".\Global.asax;" />
+	  <SqlCeAmd64Files Include=".\bin\amd64\**\*" />
+	  <SqlCeX86Files Include=".\bin\x86\**\*" />
+	  <SplashesFiles Include=".\Config\Splashes\**\*;" />
 	  <UmbracoFiles Include=".\umbraco\**\*;" />
       <UmbracoClientFiles Include=".\umbraco_client\**\*;" />
-      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
-	  <GlobalAsaxFile Include=".\Global.asax;" />
-	  <SplashesFiles Include=".\Config\Splashes\**\*;" />
 	  
+      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
+        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+	  <FilesForPackagingFromProject Include="%(AppCodeFiles.Identity)">
+        <DestinationRelativePath>App_Code\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+	  <FilesForPackagingFromProject Include="%(AppPluginsFiles.Identity)">
+        <DestinationRelativePath>App_Plugins\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(GlobalAsaxFile.Identity)">
+        <DestinationRelativePath>%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(SqlCeAmd64Files.Identity)">
+        <DestinationRelativePath>bin\amd64\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(SqlCeX86Files.Identity)">
+        <DestinationRelativePath>bin\x86\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(SplashesFiles.Identity)">
+        <DestinationRelativePath>Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
       <FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
         <DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
       </FilesForPackagingFromProject>
       <FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
         <DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
       </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
-        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(GlobalAsaxFile.Identity)">
-        <DestinationRelativePath>%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(SplashesFiles.Identity)">
-        <DestinationRelativePath>Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
     </ItemGroup>
   </Target>
 </Project>
\ No newline at end of file
diff --git a/build/NuSpecs/build/net45/UmbracoCms.targets b/build/NuSpecs/build/net45/UmbracoCms.targets
index f4fb27ba8c..0a172d4d90 100644
--- a/build/NuSpecs/build/net45/UmbracoCms.targets
+++ b/build/NuSpecs/build/net45/UmbracoCms.targets
@@ -1,28 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
+	<ItemGroup>
+	  <AppBrowsersFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\App_Browsers\**\*" />
+	  <SplashesFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\Config\Splashes\**\*;" />
+	  <SqlCeBinFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\bin\**\*;" />
+      <UmbracoFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\umbraco\**\*;" />
+      <UmbracoClientFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\umbraco_client\**\*;" />
+    </ItemGroup>
+	<Copy SourceFiles="%(AppBrowsersFiles.FullPath)"
+          DestinationFiles="App_Browsers\%(RecursiveDir)%(Filename)%(Extension)"
+          Condition="!Exists('App_Browsers\%(RecursiveDir)%(Filename)%(Extension)')" />
+	<Copy SourceFiles="%(SplashesFiles.FullPath)"
+          DestinationFiles="Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)"
+          Condition="!Exists('Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)')" />
+	<Copy SourceFiles="%(SqlCeBinFiles.FullPath)"
+          DestinationFiles="bin\%(RecursiveDir)%(Filename)%(Extension)"
+          Condition="!Exists('bin\%(RecursiveDir)%(Filename)%(Extension)')" />
+	<Copy SourceFiles="%(UmbracoFiles.FullPath)"
+          DestinationFiles="umbraco\%(RecursiveDir)%(Filename)%(Extension)"
+          Condition="!Exists('umbraco\%(RecursiveDir)%(Filename)%(Extension)')" />
+	<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
+          DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
+          Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
+  </Target>
   <Target Name="AddUmbracoFilesToOutput">
     <ItemGroup>
+      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
+	  <AppCodeFiles Include=".\App_Code\**\*" />
+	  <AppPluginsFiles Include=".\App_Plugins\**\*" />
+	  <GlobalAsaxFile Include=".\Global.asax;" />
+	  <SqlCeAmd64Files Include=".\bin\amd64\**\*" />
+	  <SqlCeX86Files Include=".\bin\x86\**\*" />
+	  <SplashesFiles Include=".\Config\Splashes\**\*;" />
 	  <UmbracoFiles Include=".\umbraco\**\*;" />
       <UmbracoClientFiles Include=".\umbraco_client\**\*;" />
-      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
-	  <GlobalAsaxFile Include=".\Global.asax;" />
-	  <SplashesFiles Include=".\Config\Splashes\**\*;" />
 	  
+      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
+        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+	  <FilesForPackagingFromProject Include="%(AppCodeFiles.Identity)">
+        <DestinationRelativePath>App_Code\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+	  <FilesForPackagingFromProject Include="%(AppPluginsFiles.Identity)">
+        <DestinationRelativePath>App_Plugins\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(GlobalAsaxFile.Identity)">
+        <DestinationRelativePath>%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(SqlCeAmd64Files.Identity)">
+        <DestinationRelativePath>bin\amd64\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(SqlCeX86Files.Identity)">
+        <DestinationRelativePath>bin\x86\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(SplashesFiles.Identity)">
+        <DestinationRelativePath>Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
       <FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
         <DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
       </FilesForPackagingFromProject>
       <FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
         <DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
       </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
-        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(GlobalAsaxFile.Identity)">
-        <DestinationRelativePath>%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(SplashesFiles.Identity)">
-        <DestinationRelativePath>Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
     </ItemGroup>
   </Target>
 </Project>
\ No newline at end of file
diff --git a/build/NuSpecs/build/net451/UmbracoCms.targets b/build/NuSpecs/build/net451/UmbracoCms.targets
index f4fb27ba8c..0a172d4d90 100644
--- a/build/NuSpecs/build/net451/UmbracoCms.targets
+++ b/build/NuSpecs/build/net451/UmbracoCms.targets
@@ -1,28 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="CopyUmbracoFilesToWebRoot" BeforeTargets="AfterBuild">
+	<ItemGroup>
+	  <AppBrowsersFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\App_Browsers\**\*" />
+	  <SplashesFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\Config\Splashes\**\*;" />
+	  <SqlCeBinFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\bin\**\*;" />
+      <UmbracoFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\umbraco\**\*;" />
+      <UmbracoClientFiles Include="..\packages\UmbracoCms.6.2.0-RC\UmbracoFiles\umbraco_client\**\*;" />
+    </ItemGroup>
+	<Copy SourceFiles="%(AppBrowsersFiles.FullPath)"
+          DestinationFiles="App_Browsers\%(RecursiveDir)%(Filename)%(Extension)"
+          Condition="!Exists('App_Browsers\%(RecursiveDir)%(Filename)%(Extension)')" />
+	<Copy SourceFiles="%(SplashesFiles.FullPath)"
+          DestinationFiles="Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)"
+          Condition="!Exists('Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)')" />
+	<Copy SourceFiles="%(SqlCeBinFiles.FullPath)"
+          DestinationFiles="bin\%(RecursiveDir)%(Filename)%(Extension)"
+          Condition="!Exists('bin\%(RecursiveDir)%(Filename)%(Extension)')" />
+	<Copy SourceFiles="%(UmbracoFiles.FullPath)"
+          DestinationFiles="umbraco\%(RecursiveDir)%(Filename)%(Extension)"
+          Condition="!Exists('umbraco\%(RecursiveDir)%(Filename)%(Extension)')" />
+	<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
+          DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
+          Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
+  </Target>
   <Target Name="AddUmbracoFilesToOutput">
     <ItemGroup>
+      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
+	  <AppCodeFiles Include=".\App_Code\**\*" />
+	  <AppPluginsFiles Include=".\App_Plugins\**\*" />
+	  <GlobalAsaxFile Include=".\Global.asax;" />
+	  <SqlCeAmd64Files Include=".\bin\amd64\**\*" />
+	  <SqlCeX86Files Include=".\bin\x86\**\*" />
+	  <SplashesFiles Include=".\Config\Splashes\**\*;" />
 	  <UmbracoFiles Include=".\umbraco\**\*;" />
       <UmbracoClientFiles Include=".\umbraco_client\**\*;" />
-      <AppBrowsersFiles Include=".\App_Browsers\**\*" />
-	  <GlobalAsaxFile Include=".\Global.asax;" />
-	  <SplashesFiles Include=".\Config\Splashes\**\*;" />
 	  
+      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
+        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+	  <FilesForPackagingFromProject Include="%(AppCodeFiles.Identity)">
+        <DestinationRelativePath>App_Code\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+	  <FilesForPackagingFromProject Include="%(AppPluginsFiles.Identity)">
+        <DestinationRelativePath>App_Plugins\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(GlobalAsaxFile.Identity)">
+        <DestinationRelativePath>%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(SqlCeAmd64Files.Identity)">
+        <DestinationRelativePath>bin\amd64\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(SqlCeX86Files.Identity)">
+        <DestinationRelativePath>bin\x86\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
+      <FilesForPackagingFromProject Include="%(SplashesFiles.Identity)">
+        <DestinationRelativePath>Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
+      </FilesForPackagingFromProject>
       <FilesForPackagingFromProject Include="%(UmbracoFiles.Identity)">
         <DestinationRelativePath>umbraco\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
       </FilesForPackagingFromProject>
       <FilesForPackagingFromProject Include="%(UmbracoClientFiles.Identity)">
         <DestinationRelativePath>umbraco_client\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
       </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(AppBrowsersFiles.Identity)">
-        <DestinationRelativePath>App_Browsers\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(GlobalAsaxFile.Identity)">
-        <DestinationRelativePath>%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
-      <FilesForPackagingFromProject Include="%(SplashesFiles.Identity)">
-        <DestinationRelativePath>Config\Splashes\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
-      </FilesForPackagingFromProject>
     </ItemGroup>
   </Target>
 </Project>
\ No newline at end of file
diff --git a/build/NuSpecs/tools/Readme.txt b/build/NuSpecs/tools/Readme.txt
index 939ea026b6..86f8a832d7 100644
--- a/build/NuSpecs/tools/Readme.txt
+++ b/build/NuSpecs/tools/Readme.txt
@@ -1,8 +1,11 @@
 A note about running Umbraco from Visual Studio.
 
-When upgrading your website using NuGet, make sure to backup all of your config files and web.config. 
+When upgrading your website using NuGet you should answer "No" to the questions to overwrite the Web.config 
+file (and config files in the config folder). 
+We will overwrite Web.config anyway but we keep a backup in the App_Data\ConfigBackup folder. There you'll 
+find a folder with the current date and time in which the backup has been placed. Make sure to merge the 
+new file with the old backup files before you proceed.
 Only the web.config will be overwritten by default to ensure that it has the necessary settings from the current release. 
-This means that you'll have to merge the files if you made any changes to the previous config files.
 
 The config files found in the config folder will usually not be changed for patch releases, so they can usually be skipped,
 but the web.config will have to have its previous "umbracoConfigurationStatus"-appsetting and "umbracoDbDSN" connection string
diff --git a/build/NuSpecs/tools/install.ps1 b/build/NuSpecs/tools/install.ps1
index aaba10d364..366045ba32 100644
--- a/build/NuSpecs/tools/install.ps1
+++ b/build/NuSpecs/tools/install.ps1
@@ -1,10 +1,20 @@
 param($rootPath, $toolsPath, $package, $project)
 
 if ($project) {	
-	# Copy umbraco files from package to project folder
+    $dateTime = Get-Date -Format yyyyMMdd-HHmmss
+    $backupPath = Join-Path (Split-Path $project.FullName -Parent) "\App_Data\ConfigBackup\$dateTime"
+	
+	# Create backup folder if it doesn't exist yet
+	New-Item -ItemType Directory -Force -Path $backupPath
+	
+	# Create a backup of original web.config
 	$projectDestinationPath = Split-Path $project.FullName -Parent
-	$umbracoFilesPath = Join-Path $rootPath "UmbracoFiles\*"
-	Copy-Item $umbracoFilesPath $projectDestinationPath -recurse -force
+	$webConfigSource = Join-Path $projectDestinationPath "Web.config"
+	Copy-Item $webConfigSource $backupPath -Force
+	
+	# Copy Web.config from package to project folder
+	$umbracoFilesPath = Join-Path $rootPath "UmbracoFiles\Web.config"
+	Copy-Item $umbracoFilesPath $projectDestinationPath -Force
 	
 	# Open readme.txt file
 	$DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt')