diff --git a/build/Build.bat b/build/Build.bat
index 7e6e418b26..0b30dc6a2e 100644
--- a/build/Build.bat
+++ b/build/Build.bat
@@ -47,19 +47,6 @@ ECHO Performing MSBuild and producing Umbraco binaries zip files
 ECHO Setting node_modules folder to hidden to prevent VS13 from crashing on it while loading the websites project
 attrib +h ..\src\Umbraco.Web.UI.Client\node_modules
 
-ECHO Adding dummy files to include in the NuGet package so that empty folders actually get created
-SET dummytext=This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete.
-ECHO %dummytext% > .\_BuildOutput\WebApp\App_Code\dummy.txt
-ECHO %dummytext% > .\_BuildOutput\WebApp\App_Data\dummy.txt
-ECHO %dummytext% > .\_BuildOutput\WebApp\App_Plugins\dummy.txt
-ECHO %dummytext% > .\_BuildOutput\WebApp\css\dummy.txt
-ECHO %dummytext% > .\_BuildOutput\WebApp\masterpages\dummy.txt
-ECHO %dummytext% > .\_BuildOutput\WebApp\media\dummy.txt
-ECHO %dummytext% > .\_BuildOutput\WebApp\scripts\dummy.txt
-ECHO %dummytext% > .\_BuildOutput\WebApp\usercontrols\dummy.txt
-ECHO %dummytext% > .\_BuildOutput\WebApp\Views\Partials\dummy.txt
-ECHO %dummytext% > .\_BuildOutput\WebApp\Views\MacroPartials\dummy.txt
-
 ECHO Adding Web.config transform files to the NuGet package
 REN .\_BuildOutput\WebApp\MacroScripts\Web.config Web.config.transform
 REN .\_BuildOutput\WebApp\Views\Web.config Web.config.transform
diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index a184b79d5d..1c035a4ffc 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -20,14 +20,8 @@
     </dependencies>
   </metadata>
   <files>
-    <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\masterpages\**" target="Content\masterpages" />
-    <file src="..\_BuildOutput\WebApp\media\**" target="Content\media" />
-    <file src="..\_BuildOutput\WebApp\scripts\**" target="Content\scripts" />
-    <file src="..\_BuildOutput\WebApp\usercontrols\**" target="Content\usercontrols" />
+    <file src="..\_BuildOutput\Configs\**" target="Content\Config" exclude="..\_BuildOutput\Configs\Web.config.transform" />
     <file src="..\_BuildOutput\WebApp\Views\**" target="Content\Views" exclude="..\_BuildOutput\WebApp\Views\Web.config" />
-    <file src="..\_BuildOutput\WebApp\xslt\**" target="Content\xslt" />
     <file src="..\_BuildOutput\WebApp\default.aspx" target="Content\default.aspx" />
     <file src="..\_BuildOutput\WebApp\Global.asax" target="Content\Global.asax" />
     <file src="..\_BuildOutput\WebApp\Web.config" target="UmbracoFiles\Web.config" />
@@ -35,7 +29,7 @@
     <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\config\splashes\**" target="UmbracoFiles\Config\splashes" />
     <file src="..\_BuildOutput\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
     <file src="..\_BuildOutput\WebApp\umbraco_client\**" target="UmbracoFiles\umbraco_client" />
     <file src="tools\install.ps1" target="tools\install.ps1" />