diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 6e00e02bbe..c72e01baa3 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -68,31 +68,31 @@
     </metadata>
     <files>
         <!-- Umbraco.Examine.Lucene HACK remove this when Examine lucene is a real netstandard dependency -->
-        <file src="$BuildTmp$\WebApp\bin\Examine.Lucene.dll" target="lib\netstandard2.0\Examine.Lucene.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Lucene.Net.dll" target="lib\netstandard2.0\Lucene.Net.dll" />
+        <file src="$BuildTmp$\bin\Examine.Lucene.dll" target="lib\netstandard2.0\Examine.Lucene.dll" />
+        <file src="$BuildTmp$\bin\Lucene.Net.dll" target="lib\netstandard2.0\Lucene.Net.dll" />
 
         <!-- libs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Configuration.dll" target="lib\netstandard2.0\Umbraco.Configuration.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.dll" target="lib\netstandard2.0\Umbraco.Core.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.Lucene.dll" target="lib\net472\Umbraco.Examine.Lucene.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.Lucene.dll" target="lib\netstandard2.0\Umbraco.Examine.Lucene.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Infrastructure.dll" target="lib\netstandard2.0\Umbraco.Infrastructure.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.PublishedCache.NuCache.dll" target="lib\netstandard2.0\Umbraco.PublishedCache.NuCache.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Configuration.dll" target="lib\netstandard2.0\Umbraco.Configuration.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Core.dll" target="lib\netstandard2.0\Umbraco.Core.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.dll" target="lib\net472\Umbraco.Examine.Lucene.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.dll" target="lib\netstandard2.0\Umbraco.Examine.Lucene.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Infrastructure.dll" target="lib\netstandard2.0\Umbraco.Infrastructure.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.PublishedCache.NuCache.dll" target="lib\netstandard2.0\Umbraco.PublishedCache.NuCache.dll" />
 
         <!-- docs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Configuration.xml" target="lib\netstandard2.0\Umbraco.Configuration.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.xml" target="lib\netstandard2.0\Umbraco.Core.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.Lucene.xml" target="lib\net472\Umbraco.Examine.Lucene.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.Lucene.xml" target="lib\netstandard2.0\Umbraco.Examine.Lucene.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Infrastructure.xml" target="lib\netstandard2.0\Umbraco.Infrastructure.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.PublishedCache.NuCache.xml" target="lib\netstandard2.0\Umbraco.PublishedCache.NuCache.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Configuration.xml" target="lib\netstandard2.0\Umbraco.Configuration.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Core.xml" target="lib\netstandard2.0\Umbraco.Core.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.xml" target="lib\net472\Umbraco.Examine.Lucene.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.xml" target="lib\netstandard2.0\Umbraco.Examine.Lucene.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Infrastructure.xml" target="lib\netstandard2.0\Umbraco.Infrastructure.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.PublishedCache.NuCache.xml" target="lib\netstandard2.0\Umbraco.PublishedCache.NuCache.xml" />
 
         <!-- symbols -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Configuration.pdb" target="lib\netstandard2.0\Umbraco.Configuration.pdb" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Core.pdb" target="lib\netstandard2.0\Umbraco.Core.pdb" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.Lucene.pdb" target="lib\net472\Umbraco.Examine.Lucene.pdb" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.Lucene.pdb" target="lib\netstandard2.0\Umbraco.Examine.Lucene.pdb" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Infrastructure.pdb" target="lib\netstandard2.0\Umbraco.Infrastructure.pdb" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.PublishedCache.NuCache.pdb" target="lib\netstandard2.0\Umbraco.PublishedCache.NuCache.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Configuration.pdb" target="lib\netstandard2.0\Umbraco.Configuration.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Core.pdb" target="lib\netstandard2.0\Umbraco.Core.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.pdb" target="lib\net472\Umbraco.Examine.Lucene.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Examine.Lucene.pdb" target="lib\netstandard2.0\Umbraco.Examine.Lucene.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Infrastructure.pdb" target="lib\netstandard2.0\Umbraco.Infrastructure.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.PublishedCache.NuCache.pdb" target="lib\netstandard2.0\Umbraco.PublishedCache.NuCache.pdb" />
     </files>
 </package>
diff --git a/build/NuSpecs/UmbracoCms.SqlCe.nuspec b/build/NuSpecs/UmbracoCms.SqlCe.nuspec
index 7af2e043eb..e45c31de80 100644
--- a/build/NuSpecs/UmbracoCms.SqlCe.nuspec
+++ b/build/NuSpecs/UmbracoCms.SqlCe.nuspec
@@ -31,13 +31,13 @@
     </metadata>
     <files>
         <!-- libs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Persistance.SqlCe.dll" target="lib\netstandard2.0\Umbraco.Persistance.SqlCe.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Persistance.SqlCe.dll" target="lib\netstandard2.0\Umbraco.Persistance.SqlCe.dll" />
         <file src="$BuildTmp$\SqlCe\System.Data.SqlServerCe.dll" target="lib\netstandard2.0\System.Data.SqlServerCe.dll" /> <!-- Hack because the file from the package is only added to net472 projects -->
 
         <!-- docs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Persistance.SqlCe.xml" target="lib\netstandard2.0\Umbraco.Persistance.SqlCe.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Persistance.SqlCe.xml" target="lib\netstandard2.0\Umbraco.Persistance.SqlCe.xml" />
 
         <!-- symbols -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Persistance.SqlCe.pdb" target="lib\netstandard2.0\Umbraco.Persistance.SqlCe.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Persistance.SqlCe.pdb" target="lib\netstandard2.0\Umbraco.Persistance.SqlCe.pdb" />
     </files>
 </package>
diff --git a/build/NuSpecs/UmbracoCms.Web.nuspec b/build/NuSpecs/UmbracoCms.Web.nuspec
index 3ba1fa3573..a35cea9df7 100644
--- a/build/NuSpecs/UmbracoCms.Web.nuspec
+++ b/build/NuSpecs/UmbracoCms.Web.nuspec
@@ -39,21 +39,21 @@
     </metadata>
     <files>
         <!-- libs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.BackOffice.dll" target="lib\netcoreapp3.1\Umbraco.Web.BackOffice.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.Common.dll" target="lib\netcoreapp3.1\Umbraco.Web.Common.dll" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.Website.dll" target="lib\netcoreapp3.1\Umbraco.Web.Website.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.BackOffice.dll" target="lib\netcoreapp3.1\Umbraco.Web.BackOffice.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.Common.dll" target="lib\netcoreapp3.1\Umbraco.Web.Common.dll" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.Website.dll" target="lib\netcoreapp3.1\Umbraco.Web.Website.dll" />
         <!--Umbraco.ModelsBuilder.Embedded-->
 
         <!-- docs -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.BackOffice.xml" target="lib\netcoreapp3.1\Umbraco.Web.BackOffice.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.Common.xml" target="lib\netcoreapp3.1\Umbraco.Web.Common.xml" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.Website.xml" target="lib\netcoreapp3.1\Umbraco.Web.Website.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.BackOffice.xml" target="lib\netcoreapp3.1\Umbraco.Web.BackOffice.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.Common.xml" target="lib\netcoreapp3.1\Umbraco.Web.Common.xml" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.Website.xml" target="lib\netcoreapp3.1\Umbraco.Web.Website.xml" />
         <!--Umbraco.ModelsBuilder.Embedded-->
 
         <!-- symbols -->
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.BackOffice.pdb" target="lib\netcoreapp3.1\Umbraco.Web.BackOffice.pdb" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.Common.pdb" target="lib\netcoreapp3.1\Umbraco.Web.Common.pdb" />
-        <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.Website.pdb" target="lib\netcoreapp3.1\Umbraco.Web.Website.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.BackOffice.pdb" target="lib\netcoreapp3.1\Umbraco.Web.BackOffice.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.Common.pdb" target="lib\netcoreapp3.1\Umbraco.Web.Common.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.Web.Website.pdb" target="lib\netcoreapp3.1\Umbraco.Web.Website.pdb" />
         <!--Umbraco.ModelsBuilder.Embedded-->
     </files>
 </package>
diff --git a/build/build.ps1 b/build/build.ps1
index f043e7b860..910bd005d8 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -383,6 +383,7 @@
     $env:UMBRACO_RELEASE=$this.Version.Release
     $env:UMBRACO_COMMENT=$this.Version.Comment
     $env:UMBRACO_BUILD=$this.Version.Build
+    $env:UMBRACO_TMP="$($this.SolutionRoot)\build.tmp"
 
     if ($args -and $args[0] -eq "vso")
     {
@@ -460,7 +461,7 @@
   {
     $this.VerifyNuGetConsistency(
       ("UmbracoCms", "UmbracoCms.Core", "UmbracoCms.Web"),
-      ("Umbraco.Core", "Umbraco.Web", "Umbraco.Web.UI", "Umbraco.Examine"))
+      ("Umbraco.Core", "Umbraco.Infrastructure", "Umbraco.Configuration", "Umbraco.Web.UI.NetCore", "Umbraco.Examine.Lucene", "Umbraco.PublishedCache.NuCache", "Umbraco.Web.Common", "Umbraco.Web.Website", "Umbraco.Web.BackOffice"))
     if ($this.OnError()) { return }
   })
 
diff --git a/src/Umbraco.Configuration/Umbraco.Configuration.csproj b/src/Umbraco.Configuration/Umbraco.Configuration.csproj
index 9111a713ad..a4dac22386 100644
--- a/src/Umbraco.Configuration/Umbraco.Configuration.csproj
+++ b/src/Umbraco.Configuration/Umbraco.Configuration.csproj
@@ -29,7 +29,7 @@
       <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.2" />
       <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.2" />
       <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.2" />
-      <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0" />
+      <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 69ca2e5f18..b5e553a78e 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -16,7 +16,7 @@
 
     <ItemGroup>
       <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
-      <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0" />
+      <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
       <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
       <PackageReference Include="System.Runtime.Caching" Version="4.6.0" />
     </ItemGroup>
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index c1bcd400cd..9a552d04d8 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -108,7 +108,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="Owin" Version="1.0" />
     <PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.0" />
     <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
index ba4a7263bb..8038479d82 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
@@ -9,7 +9,9 @@
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
         <DocumentationFile>bin\Release\Umbraco.Web.UI.NetCore.xml</DocumentationFile>
     </PropertyGroup>
-
+    <PropertyGroup>
+        <CopyRazorGenerateFilesToPublishDirectory>true</CopyRazorGenerateFilesToPublishDirectory>
+    </PropertyGroup>
     <ItemGroup>
       <ProjectReference Include="..\Umbraco.PublishedCache.NuCache\Umbraco.PublishedCache.NuCache.csproj" />
       <ProjectReference Include="..\Umbraco.Web.BackOffice\Umbraco.Web.BackOffice.csproj" />
@@ -26,10 +28,24 @@
     </ItemGroup>
 
 
+        <None Include="config\**\*.*">
+            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+        </None>
+        <None Include="umbraco\**\*.*">
+            <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <CopyToPublishDirectory>Always</CopyToPublishDirectory>
+        </None>
+    </ItemGroup>
+    
     <ItemGroup>
       <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.3" />
         <!-- TODO: remove the reference to System.Configuration.ConfigurationManager when Examine/lucene dont need it-->
         <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
     </ItemGroup>
 
+
+
 </Project>