diff --git a/src/Umbraco.Web.UI/config/Lang/cs-CZ.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/cs-CZ.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/cs-CZ.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/cs-CZ.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/da-DK.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/da-DK.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/da-DK.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/da-DK.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/de-DE.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/de-DE.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/de-DE.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/de-DE.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/en-GB.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/en-GB.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/en-GB.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/en-GB.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/en-US.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/en-US.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/en-US.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/en-US.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/es-ES.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/es-ES.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/es-ES.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/es-ES.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/fr-FR.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/fr-FR.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/fr-FR.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/fr-FR.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/he-IL.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/he-IL.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/he-IL.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/he-IL.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/it-IT.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/it-IT.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/it-IT.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/it-IT.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/ja-JP.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/ja-JP.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/ja-JP.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/ja-JP.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/ko-KR.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/ko-KR.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/ko-KR.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/ko-KR.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/nb-NO.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/nb-NO.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/nb-NO.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/nb-NO.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/nl-NL.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/nl-NL.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/nl-NL.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/nl-NL.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/pl-PL.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/pl-PL.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/pl-PL.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/pl-PL.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/pt-BR.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/pt-BR.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/pt-BR.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/pt-BR.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/ru-RU.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/ru-RU.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/ru-RU.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/ru-RU.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/sv-SE.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/sv-SE.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/sv-SE.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/sv-SE.user.xml
diff --git a/src/Umbraco.Web.UI/config/Lang/zh-CN.user.xml b/src/Umbraco.Web.UI.NetCore/Config/lang/zh-CN.user.xml
similarity index 100%
rename from src/Umbraco.Web.UI/config/Lang/zh-CN.user.xml
rename to src/Umbraco.Web.UI.NetCore/Config/lang/zh-CN.user.xml
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 30859c2d71..67f1c56b0f 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
@@ -17,72 +17,6 @@
       <ProjectReference Include="..\Umbraco.Web.Website\Umbraco.Web.Website.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Folder Include="css" />
-      <Folder Include="Umbraco" />
-      <Folder Include="Views" />
-      <Folder Include="Views\" />
-      <Folder Include="wwwroot\Media" />
-      <Folder Include="wwwroot\Umbraco\views\install" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <Compile Remove="App_Data\**" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <EmbeddedResource Remove="App_Data\**" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <None Remove="App_Data\**" />
-        <None Include="Config\tinyMceConfig.Release.config">
-          <DependentUpon>tinyMceConfig.config</DependentUpon>
-          <SubType>Designer</SubType>
-        </None>
-        <None Include="Config\umbracoSettings.Release.config">
-          <DependentUpon>umbracoSettings.config</DependentUpon>
-          <SubType>Designer</SubType>
-        </None>
-    </ItemGroup>
-
-    <ItemGroup>
-        <Content Remove="App_Data\**" />
-        <Content Remove="wwwroot\Umbraco\views\install\machinekey.html" />
-        <Content Remove="wwwroot\Umbraco\views\install\permissionsreport.html" />
-        <Content Remove="wwwroot\Umbraco\views\install\starterkit.html" />
-        <Content Remove="wwwroot\Umbraco\views\install\upgrade.html" />
-        <Content Remove="wwwroot\Umbraco\views\install\user.html" />
-        <Content Remove="wwwroot\Umbraco\views\install\version7upgradereport.html" />
-        <Content Remove="wwwroot\Umbraco\views\install\continueinstall.html" />
-        <Content Remove="wwwroot\Umbraco\views\install\database.html" />
-        <Content Remove="wwwroot\Umbraco\views\install\error.html" />
-        <Content Update="config\tinyMceConfig.config">
-          <SubType>Designer</SubType>
-        </Content>
-        <Content Update="config\umbracoSettings.config">
-          <SubType>Designer</SubType>
-        </Content>
-        <Content Remove="wwwroot\Web.config" />
-        <Content Remove="Umbraco\PartialViewMacros\Templates\Gallery.cshtml" />
-        <Content Remove="Umbraco\PartialViewMacros\Templates\ListAncestorsFromCurrentPage.cshtml" />
-        <Content Remove="Umbraco\PartialViewMacros\Templates\ListChildPagesFromChangeableSource.cshtml" />
-        <Content Remove="Umbraco\PartialViewMacros\Templates\ListChildPagesFromCurrentPage.cshtml" />
-        <Content Remove="Umbraco\PartialViewMacros\Templates\ListChildPagesOrderedByDate.cshtml" />
-        <Content Remove="Umbraco\PartialViewMacros\Templates\ListChildPagesOrderedByName.cshtml" />
-        <Content Remove="Umbraco\PartialViewMacros\Templates\ListChildPagesOrderedByProperty.cshtml" />
-        <Content Remove="Umbraco\PartialViewMacros\Templates\ListChildPagesWithDoctype.cshtml" />
-        <Content Remove="Umbraco\PartialViewMacros\Templates\ListDescendantsFromCurrentPage.cshtml" />
-        <Content Remove="Umbraco\PartialViewMacros\Templates\ListImagesFromMediaFolder.cshtml" />
-        <Content Remove="Umbraco\PartialViewMacros\Templates\Login.cshtml" />
-        <Content Remove="Umbraco\PartialViewMacros\Templates\LoginStatus.cshtml" />
-        <Content Remove="Umbraco\PartialViewMacros\Templates\MultinodeTree-picker.cshtml" />
-        <Content Remove="Umbraco\PartialViewMacros\Templates\Navigation.cshtml" />
-        <Content Remove="Umbraco\PartialViewMacros\Templates\RegisterMember.cshtml" />
-        <Content Remove="Umbraco\PartialViewMacros\Templates\SiteMap.cshtml" />
-        <Content Remove="Umbraco\PartialViewMacros\Templates\EditProfile.cshtml" />
-    </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-->
@@ -90,41 +24,62 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Content Remove="Config\serilog.Release.config" />
-      <Content Remove="Config\serilog.user.Release.config" />
+      <Content Remove="Umbraco\PartialViewMacros\Templates\Gallery.cshtml" />
+      <Content Remove="Umbraco\PartialViewMacros\Templates\ListAncestorsFromCurrentPage.cshtml" />
+      <Content Remove="Umbraco\PartialViewMacros\Templates\ListChildPagesFromChangeableSource.cshtml" />
+      <Content Remove="Umbraco\PartialViewMacros\Templates\ListChildPagesFromCurrentPage.cshtml" />
+      <Content Remove="Umbraco\PartialViewMacros\Templates\ListChildPagesOrderedByDate.cshtml" />
+      <Content Remove="Umbraco\PartialViewMacros\Templates\ListChildPagesOrderedByName.cshtml" />
+      <Content Remove="Umbraco\PartialViewMacros\Templates\ListChildPagesOrderedByProperty.cshtml" />
+      <Content Remove="Umbraco\PartialViewMacros\Templates\ListChildPagesWithDoctype.cshtml" />
+      <Content Remove="Umbraco\PartialViewMacros\Templates\ListDescendantsFromCurrentPage.cshtml" />
+      <Content Remove="Umbraco\PartialViewMacros\Templates\ListImagesFromMediaFolder.cshtml" />
+      <Content Remove="Umbraco\PartialViewMacros\Templates\Login.cshtml" />
+      <Content Remove="Umbraco\PartialViewMacros\Templates\LoginStatus.cshtml" />
+      <Content Remove="Umbraco\PartialViewMacros\Templates\MultinodeTree-picker.cshtml" />
+      <Content Remove="Umbraco\PartialViewMacros\Templates\Navigation.cshtml" />
+      <Content Remove="Umbraco\PartialViewMacros\Templates\RegisterMember.cshtml" />
+      <Content Remove="Umbraco\PartialViewMacros\Templates\SiteMap.cshtml" />
+      <Content Remove="Umbraco\PartialViewMacros\Templates\EditProfile.cshtml" />
+      <Content Include="Config\lang\cs-CZ.user.xml" />
+      <Content Include="Config\lang\da-DK.user.xml" />
+      <Content Include="Config\lang\de-DE.user.xml" />
+      <Content Include="Config\lang\en-GB.user.xml" />
+      <Content Include="Config\lang\en-US.user.xml" />
+      <Content Include="Config\lang\es-ES.user.xml" />
+      <Content Include="Config\lang\fr-FR.user.xml" />
+      <Content Include="Config\lang\he-IL.user.xml" />
+      <Content Include="Config\lang\it-IT.user.xml" />
+      <Content Include="Config\lang\ja-JP.user.xml" />
+      <Content Include="Config\lang\ko-KR.user.xml" />
+      <Content Include="Config\lang\nb-NO.user.xml" />
+      <Content Include="Config\lang\nl-NL.user.xml" />
+      <Content Include="Config\lang\pl-PL.user.xml" />
+      <Content Include="Config\lang\pt-BR.user.xml" />
+      <Content Include="Config\lang\ru-RU.user.xml" />
+      <Content Include="Config\lang\sv-SE.user.xml" />
+      <Content Include="Config\lang\zh-CN.user.xml" />
     </ItemGroup>
 
     <ItemGroup>
-      <None Remove="Config\logviewer.searches.config.js" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <Content Include="Config\grid.editors.config.js" />
-      <Content Include="Config\logviewer.searches.config.js" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <None Include="Config\serilog.Release.config">
-        <SubType>Designer</SubType>
-        <DependentUpon>serilog.config</DependentUpon>
-      </None>
-      <None Include="Config\serilog.user.Release.config">
-        <SubType>Designer</SubType>
-        <DependentUpon>serilog.user.config</DependentUpon>
-      </None>
-    </ItemGroup>
-
-    <ItemGroup>
-      <Content Update="Config\serilog.config">
-        <SubType>Designer</SubType>
-      </Content>
-      <Content Update="Config\serilog.user.config">
-        <SubType>Designer</SubType>
-      </Content>
-    </ItemGroup>
-
-    <ItemGroup>
-      <AdditionalFiles Include="Umbraco\PartialViewMacros\Templates\Empty.cshtml" />
+      <AdditionalFiles Include="Config\lang\cs-CZ.user.xml" />
+      <AdditionalFiles Include="Config\lang\da-DK.user.xml" />
+      <AdditionalFiles Include="Config\lang\de-DE.user.xml" />
+      <AdditionalFiles Include="Config\lang\en-GB.user.xml" />
+      <AdditionalFiles Include="Config\lang\en-US.user.xml" />
+      <AdditionalFiles Include="Config\lang\es-ES.user.xml" />
+      <AdditionalFiles Include="Config\lang\fr-FR.user.xml" />
+      <AdditionalFiles Include="Config\lang\he-IL.user.xml" />
+      <AdditionalFiles Include="Config\lang\it-IT.user.xml" />
+      <AdditionalFiles Include="Config\lang\ja-JP.user.xml" />
+      <AdditionalFiles Include="Config\lang\ko-KR.user.xml" />
+      <AdditionalFiles Include="Config\lang\nb-NO.user.xml" />
+      <AdditionalFiles Include="Config\lang\nl-NL.user.xml" />
+      <AdditionalFiles Include="Config\lang\pl-PL.user.xml" />
+      <AdditionalFiles Include="Config\lang\pt-BR.user.xml" />
+      <AdditionalFiles Include="Config\lang\ru-RU.user.xml" />
+      <AdditionalFiles Include="Config\lang\sv-SE.user.xml" />
+      <AdditionalFiles Include="Config\lang\zh-CN.user.xml" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 952e8e002f..8d47a7b019 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -143,24 +143,6 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
-    <Content Include="Config\Lang\cs-CZ.user.xml" />
-    <Content Include="Config\Lang\da-DK.user.xml" />
-    <Content Include="Config\Lang\de-DE.user.xml" />
-    <Content Include="Config\Lang\en-GB.user.xml" />
-    <Content Include="Config\Lang\en-US.user.xml" />
-    <Content Include="Config\Lang\es-ES.user.xml" />
-    <Content Include="Config\Lang\fr-FR.user.xml" />
-    <Content Include="Config\Lang\he-IL.user.xml" />
-    <Content Include="Config\Lang\it-IT.user.xml" />
-    <Content Include="Config\Lang\ja-JP.user.xml" />
-    <Content Include="Config\Lang\ko-KR.user.xml" />
-    <Content Include="Config\Lang\nl-NL.user.xml" />
-    <Content Include="Config\Lang\nb-NO.user.xml" />
-    <Content Include="Config\Lang\pl-PL.user.xml" />
-    <Content Include="Config\Lang\pt-BR.user.xml" />
-    <Content Include="Config\Lang\ru-RU.user.xml" />
-    <Content Include="Config\Lang\sv-SE.user.xml" />
-    <Content Include="Config\Lang\zh-CN.user.xml" />
     <None Include="Config\splashes\NoNodes.cshtml" />
     <Content Include="Umbraco\Install\Views\Web.config" />
     <None Include="Config\ClientDependency.Release.config">