diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 8d47a7b019..88ba56b9a4 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -80,7 +80,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
-    <Folder Include="Umbraco\PartialViewMacros\Templates" />
     <Folder Include="Views\MacroPartials\" />
   </ItemGroup>
   <ItemGroup>
@@ -187,6 +186,74 @@
     <Content Include="Config\ClientDependency.config">
       <SubType>Designer</SubType>
     </Content>
+    <Content Include="Umbraco\PartialViewMacros\Templates\EditProfile.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="Umbraco\PartialViewMacros\Templates\Gallery.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="Umbraco\PartialViewMacros\Templates\ListAncestorsFromCurrentPage.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="Umbraco\PartialViewMacros\Templates\ListChildPagesFromChangeableSource.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="Umbraco\PartialViewMacros\Templates\ListChildPagesFromCurrentPage.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="Umbraco\PartialViewMacros\Templates\ListChildPagesOrderedByDate.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="Umbraco\PartialViewMacros\Templates\ListChildPagesOrderedByName.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="Umbraco\PartialViewMacros\Templates\ListChildPagesOrderedByProperty.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="Umbraco\PartialViewMacros\Templates\ListChildPagesWithDoctype.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="Umbraco\PartialViewMacros\Templates\ListDescendantsFromCurrentPage.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="Umbraco\PartialViewMacros\Templates\ListImagesFromMediaFolder.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="Umbraco\PartialViewMacros\Templates\Login.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="Umbraco\PartialViewMacros\Templates\LoginStatus.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="Umbraco\PartialViewMacros\Templates\MultinodeTree-picker.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="Umbraco\PartialViewMacros\Templates\Navigation.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="Umbraco\PartialViewMacros\Templates\RegisterMember.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="Umbraco\PartialViewMacros\Templates\SiteMap.cshtml">
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
     <Content Include="Umbraco\Views\Default.cshtml" />
     <Content Include="Umbraco\Views\AuthorizeUpgrade.cshtml" />
     <Content Include="Views\Web.config">
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
similarity index 97%
rename from src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
rename to src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
index 5c32331d36..576541ea4a 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
@@ -2,7 +2,7 @@
 @using Umbraco.Web
 @using Umbraco.Web.Composing
 @using Umbraco.Web.Controllers
-@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage
+@inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @{
     var profileModel = Current.MembershipHelper.GetCurrentMemberProfileModel();
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/Gallery.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
similarity index 96%
rename from src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
rename to src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
index 3cc018f6d2..8388c7a90d 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml
@@ -3,7 +3,7 @@
 @using Umbraco.Core
 @using Umbraco.Core.Media
 @using Umbraco.Web.Composing
-@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage
+@inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @*
     Macro to display a gallery of images from the Media section.
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml
similarity index 93%
rename from src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml
rename to src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml
index 62700f96a7..070f67ff23 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListAncestorsFromCurrentPage.cshtml
@@ -1,6 +1,6 @@
 @using Umbraco.Core
 @using Umbraco.Web
-@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage
+@inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @*
     This snippet makes a list of links to the of parents of the current page using an unordered HTML list.
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml
similarity index 94%
rename from src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml
rename to src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml
index 6d341609be..ec41d45c0c 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesFromChangeableSource.cshtml
@@ -1,6 +1,6 @@
 @using Umbraco.Web
 @using Umbraco.Web.Composing
-@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage
+@inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @*
     Macro to list all child pages under a specific page in the content tree.
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml
similarity index 90%
rename from src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml
rename to src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml
index 9362da2ee2..e6606d6204 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesFromCurrentPage.cshtml
@@ -1,5 +1,5 @@
 @using Umbraco.Web
-@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage
+@inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @*
     This snippet makes a list of links to the of children of the current page using an unordered HTML list.
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml
similarity index 92%
rename from src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml
rename to src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml
index ca104da99d..2c2cc4422b 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml
@@ -1,5 +1,5 @@
 @using Umbraco.Web
-@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage
+@inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @*
     This snippet makes a list of links to the of children of the current page using an unordered HTML list.
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml
similarity index 91%
rename from src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml
rename to src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml
index c6d824dea4..d0398e7272 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml
@@ -1,5 +1,5 @@
 @using Umbraco.Web
-@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage
+@inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @*
     This snippet makes a list of links to the of children of the current page using an unordered HTML list.
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml
similarity index 94%
rename from src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml
rename to src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml
index d80fe016f6..1bffae04c4 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml
@@ -1,5 +1,5 @@
 @using Umbraco.Web
-@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage
+@inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @*
     Macro to list all child pages with a specific property, sorted by the value of that property.
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml
similarity index 91%
rename from src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml
rename to src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml
index 658d4883c2..c90e419903 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml
@@ -1,6 +1,6 @@
 @using Umbraco.Core.Models.PublishedContent
 @using Umbraco.Web
-@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage
+@inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @*
     This snippet shows how simple it is to fetch only children of a certain Document Type.
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml
similarity index 97%
rename from src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml
rename to src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml
index 14d74aa64d..7ae917b41d 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListDescendantsFromCurrentPage.cshtml
@@ -1,6 +1,6 @@
 @using Umbraco.Core.Models.PublishedContent
 @using Umbraco.Web
-@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage
+@inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @*
     This snippet creates links for every single page (no matter how deep) below
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml
similarity index 94%
rename from src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml
rename to src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml
index 0910f76ed7..386bc824df 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListImagesFromMediaFolder.cshtml
@@ -1,6 +1,6 @@
 @using Umbraco.Web
 @using Umbraco.Web.Composing
-@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage
+@inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @*
     Macro to display a series of images from a media folder.
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/Login.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
similarity index 95%
rename from src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/Login.cshtml
rename to src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
index fbb7627120..b50d1ac806 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/Login.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
@@ -3,7 +3,7 @@
 @using Umbraco.Web.Composing
 @using Umbraco.Web.Models
 @using Umbraco.Web.Controllers
-@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage
+@inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @{
     var loginModel = new LoginModel();
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
similarity index 93%
rename from src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
rename to src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
index e3dc5d3c7f..78b06151af 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
@@ -3,7 +3,7 @@
 @using Umbraco.Web.Composing
 @using Umbraco.Web.Models
 @using Umbraco.Web.Controllers
-@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage
+@inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @{
     var loginStatusModel = Current.MembershipHelper.GetCurrentLoginStatus();
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml
similarity index 92%
rename from src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml
rename to src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml
index 2cf1da9cec..d845e699e0 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/MultinodeTree-picker.cshtml
@@ -1,6 +1,6 @@
 @using Umbraco.Core.Models.PublishedContent
 @using Umbraco.Web
-@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage
+@inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @*
     This snippet lists the items from a Multinode tree picker, using the picker's default settings.
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/Navigation.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Navigation.cshtml
similarity index 92%
rename from src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/Navigation.cshtml
rename to src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Navigation.cshtml
index 499e4bfca7..15427f4b3c 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/Navigation.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Navigation.cshtml
@@ -1,6 +1,6 @@
 @using Umbraco.Core
 @using Umbraco.Web
-@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage
+@inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @*
     This snippet displays a list of links of the pages immediately under the top-most page in the content tree.
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
similarity index 98%
rename from src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
rename to src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
index 895719f693..5e6230a294 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
@@ -2,7 +2,7 @@
 @using Umbraco.Web
 @using Umbraco.Web.Composing
 @using Umbraco.Web.Controllers
-@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage
+@inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @{
     @*
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/SiteMap.cshtml b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/SiteMap.cshtml
similarity index 95%
rename from src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/SiteMap.cshtml
rename to src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/SiteMap.cshtml
index 15fda02b58..a4127a9636 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco/PartialViewMacros/Templates/SiteMap.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/SiteMap.cshtml
@@ -1,7 +1,7 @@
 @using Umbraco.Core
 @using Umbraco.Core.Models.PublishedContent
 @using Umbraco.Web
-@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage
+@inherits Umbraco.Web.Macros.PartialViewMacroPage
 
 @*
     This snippet makes a list of links of all visible pages of the site, as nested unordered HTML lists.