diff --git a/src/Umbraco.Web/Macros/IMacroRenderer.cs b/src/Umbraco.Core/Macros/IMacroRenderer.cs
similarity index 100%
rename from src/Umbraco.Web/Macros/IMacroRenderer.cs
rename to src/Umbraco.Core/Macros/IMacroRenderer.cs
diff --git a/src/Umbraco.Web/Macros/MacroPropertyModel.cs b/src/Umbraco.Core/Macros/MacroPropertyModel.cs
similarity index 100%
rename from src/Umbraco.Web/Macros/MacroPropertyModel.cs
rename to src/Umbraco.Core/Macros/MacroPropertyModel.cs
diff --git a/src/Umbraco.Web/Macros/MacroTagParser.cs b/src/Umbraco.Infrastructure/Macros/MacroTagParser.cs
similarity index 96%
rename from src/Umbraco.Web/Macros/MacroTagParser.cs
rename to src/Umbraco.Infrastructure/Macros/MacroTagParser.cs
index 7dea3674b0..2cbd84e20a 100644
--- a/src/Umbraco.Web/Macros/MacroTagParser.cs
+++ b/src/Umbraco.Infrastructure/Macros/MacroTagParser.cs
@@ -10,7 +10,7 @@ namespace Umbraco.Web.Macros
     /// <summary>
     /// Parses the macro syntax in a string and renders out it's contents
     /// </summary>
-    internal class MacroTagParser
+    public class MacroTagParser
     {
         private static readonly Regex MacroRteContent = new Regex(@"(<!--\s*?)(<\?UMBRACO_MACRO.*?/>)(\s*?-->)",
             RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.Singleline);
@@ -35,7 +35,7 @@ namespace Umbraco.Web.Macros
         ///     {/div}
         ///
         /// </remarks>
-        internal static string FormatRichTextPersistedDataForEditor(string persistedContent, IDictionary<string ,string> htmlAttributes)
+        public static string FormatRichTextPersistedDataForEditor(string persistedContent, IDictionary<string ,string> htmlAttributes)
         {
             return MacroPersistedFormat.Replace(persistedContent, match =>
             {
@@ -92,7 +92,7 @@ namespace Umbraco.Web.Macros
         /// since this is exactly how we need to persist it to the db.
         ///
         /// </remarks>
-        internal static string FormatRichTextContentForPersistence(string rteContent)
+        public static string FormatRichTextContentForPersistence(string rteContent)
         {
             if (string.IsNullOrEmpty(rteContent))
             {
@@ -145,7 +145,7 @@ namespace Umbraco.Web.Macros
         /// This method  simply parses the macro contents, it does not create a string or result,
         /// this is up to the developer calling this method to implement this with the callbacks.
         /// </remarks>
-        internal static void ParseMacros(
+        public static void ParseMacros(
             string text,
             Action<string> textFoundCallback,
             Action<string, Dictionary<string, string>> macroFoundCallback )
diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
index f73e5a548e..27dae62e72 100644
--- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
+++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -6,6 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+      <PackageReference Include="HtmlAgilityPack" Version="1.8.14" />
       <PackageReference Include="LightInject" Version="6.2.0" />
       <PackageReference Include="LightInject.Annotation" Version="1.1.0" />
       <PackageReference Include="Markdown" Version="2.2.1" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 5e7654e896..a66ddf8922 100755
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -167,8 +167,6 @@
     <Compile Include="Logging\WebProfilerComponent.cs" />
     <Compile Include="Logging\WebProfilerComposer.cs" />
     <Compile Include="Logging\WebProfilerProvider.cs" />
-    <Compile Include="Macros\IMacroRenderer.cs" />
-    <Compile Include="Macros\PublishedContentHashtableConverter.cs" />
     <Compile Include="Models\Identity\BackOfficeIdentityUser.cs" />
     <Compile Include="Models\Identity\IdentityMapDefinition.cs" />
     <Compile Include="Models\Identity\IdentityUser.cs" />
@@ -238,7 +236,6 @@
     <Compile Include="Editors\BackOfficeServerVariables.cs" />
     <Compile Include="Editors\LogViewerController.cs" />
     <Compile Include="ImageProcessorLogger.cs" />
-    <Compile Include="Macros\MacroTagParser.cs" />
     <Compile Include="Trees\LogViewerTreeController.cs" />
     <Compile Include="Mvc\ContainerControllerFactory.cs" />
     <Compile Include="OwinExtensions.cs" />
@@ -282,10 +279,7 @@
     <Compile Include="Install\InstallSteps\ConfigureMachineKey.cs" />
     <Compile Include="Editors\MemberGroupController.cs" />
     <Compile Include="Composing\CompositionExtensions\Controllers.cs" />
-    <Compile Include="Macros\MacroContent.cs" />
-    <Compile Include="Macros\MacroModel.cs" />
     <Compile Include="HealthCheck\HealthCheckController.cs" />
-    <Compile Include="Macros\MacroPropertyModel.cs" />
     <Compile Include="Macros\MacroRenderer.cs" />
     <Compile Include="HtmlHelperBackOfficeExtensions.cs" />
     <Compile Include="Composing\ModuleInjector.cs" />