diff --git a/src/Umbraco.Core/Composing/IFactory.cs b/src/Umbraco.Abstractions/Composing/IFactory.cs
similarity index 100%
rename from src/Umbraco.Core/Composing/IFactory.cs
rename to src/Umbraco.Abstractions/Composing/IFactory.cs
diff --git a/src/Umbraco.Core/Composing/IRegister.cs b/src/Umbraco.Abstractions/Composing/IRegister.cs
similarity index 100%
rename from src/Umbraco.Core/Composing/IRegister.cs
rename to src/Umbraco.Abstractions/Composing/IRegister.cs
diff --git a/src/Umbraco.Core/Composing/Lifetime.cs b/src/Umbraco.Abstractions/Composing/Lifetime.cs
similarity index 100%
rename from src/Umbraco.Core/Composing/Lifetime.cs
rename to src/Umbraco.Abstractions/Composing/Lifetime.cs
diff --git a/src/Umbraco.Abstractions/DataTableExtensions.cs b/src/Umbraco.Abstractions/DataTableExtensions.cs
index 1c547b9d44..63b2671d09 100644
--- a/src/Umbraco.Abstractions/DataTableExtensions.cs
+++ b/src/Umbraco.Abstractions/DataTableExtensions.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Core
     /// <summary>
     /// Static and extension methods for the DataTable object
     /// </summary>
-    internal static class DataTableExtensions
+    public static class DataTableExtensions
     {
         /// <summary>
         /// Creates a DataTable with the specified alias and columns and uses a callback to populate the headers.
@@ -57,7 +57,7 @@ namespace Umbraco.Core
         /// <remarks>
         /// This is for legacy code, I didn't want to go creating custom classes for these
         /// </remarks>
-        internal static List<System.Tuple<IEnumerable<KeyValuePair<string, object>>, IEnumerable<KeyValuePair<string, object>>>> CreateTableData()
+        public static List<System.Tuple<IEnumerable<KeyValuePair<string, object>>, IEnumerable<KeyValuePair<string, object>>>> CreateTableData()
         {
             return new List<System.Tuple<IEnumerable<KeyValuePair<string, object>>, IEnumerable<KeyValuePair<string, object>>>>();
         }
@@ -71,7 +71,7 @@ namespace Umbraco.Core
         /// <remarks>
         /// This is for legacy code, I didn't want to go creating custom classes for these
         /// </remarks>
-        internal static void AddRowData(
+        public static void AddRowData(
             List<System.Tuple<IEnumerable<KeyValuePair<string, object>>, IEnumerable<KeyValuePair<string, object>>>> rowData,
             IEnumerable<KeyValuePair<string, object>> standardVals,
             IEnumerable<KeyValuePair<string, object>> userVals)
diff --git a/src/Umbraco.Core/IEmailSender.cs b/src/Umbraco.Abstractions/IEmailSender.cs
similarity index 100%
rename from src/Umbraco.Core/IEmailSender.cs
rename to src/Umbraco.Abstractions/IEmailSender.cs
diff --git a/src/Umbraco.Core/LambdaExpressionCacheKey.cs b/src/Umbraco.Abstractions/LambdaExpressionCacheKey.cs
similarity index 98%
rename from src/Umbraco.Core/LambdaExpressionCacheKey.cs
rename to src/Umbraco.Abstractions/LambdaExpressionCacheKey.cs
index 52ec786a6d..c191732acc 100644
--- a/src/Umbraco.Core/LambdaExpressionCacheKey.cs
+++ b/src/Umbraco.Abstractions/LambdaExpressionCacheKey.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Core
     /// Represents a simple <see cref="LambdaExpression"/> in a form which is suitable for using as a dictionary key
     /// by exposing the return type, argument types and expression string form in a single concatenated string.
     /// </summary>
-    internal struct LambdaExpressionCacheKey
+    public struct LambdaExpressionCacheKey
     {
         public LambdaExpressionCacheKey(string returnType, string expression, params string[] argTypes)
         {
diff --git a/src/Umbraco.Core/MonitorLock.cs b/src/Umbraco.Abstractions/MonitorLock.cs
similarity index 100%
rename from src/Umbraco.Core/MonitorLock.cs
rename to src/Umbraco.Abstractions/MonitorLock.cs
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 2e57d8aa3b..12beaecb96 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -196,10 +196,7 @@
     <Compile Include="Composing\HideFromTypeFinderAttribute.cs" />
     <Compile Include="Composing\IBuilderCollection.cs" />
     <Compile Include="Composing\ICollectionBuilder.cs" />
-    <Compile Include="Composing\IFactory.cs" />
-    <Compile Include="Composing\IRegister.cs" />
     <Compile Include="Composing\LazyCollectionBuilderBase.cs" />
-    <Compile Include="Composing\Lifetime.cs" />
     <Compile Include="Composing\LightInject\LightInjectContainer.cs" />
     <Compile Include="Composing\LightInject\MixedLightInjectScopeManagerProvider.cs" />
     <Compile Include="Composing\OrderedCollectionBuilderBase.cs" />
@@ -619,7 +616,6 @@
     <Compile Include="HashGenerator.cs" />
     <Compile Include="HttpContextExtensions.cs" />
     <Compile Include="IDisposeOnRequestEnd.cs" />
-    <Compile Include="IEmailSender.cs" />
     <Compile Include="IntExtensions.cs" />
     <Compile Include="IO\FileSecurityException.cs" />
     <Compile Include="IO\FileSystemExtensions.cs" />
@@ -637,7 +633,6 @@
     <Compile Include="IO\ViewHelper.cs" />
     <Compile Include="IRuntime.cs" />
     <Compile Include="IRuntimeState.cs" />
-    <Compile Include="LambdaExpressionCacheKey.cs" />
     <Compile Include="Logging\DebugDiagnosticsLogger.cs" />
     <Compile Include="Logging\Serilog\SerilogLogger.cs" />
     <Compile Include="Logging\LoggingTaskExtension.cs" />
@@ -867,7 +862,6 @@
     <Compile Include="Models\ObjectTypes.cs" />
     <Compile Include="Models\UserExtensions.cs" />
     <Compile Include="Models\Validation\RequiredForPersistenceAttribute.cs" />
-    <Compile Include="MonitorLock.cs" />
     <Compile Include="NamedUdiRange.cs" />
     <Compile Include="NameValueCollectionExtensions.cs" />
     <Compile Include="NetworkHelper.cs" />