diff --git a/src/Umbraco.Configuration/ConfigsExtensions.cs b/src/Umbraco.Configuration/ConfigsExtensions.cs
new file mode 100644
index 0000000000..0ecfc46896
--- /dev/null
+++ b/src/Umbraco.Configuration/ConfigsExtensions.cs
@@ -0,0 +1,28 @@
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Configuration.Grid;
+using Umbraco.Core.Configuration.HealthChecks;
+using Umbraco.Core.Configuration.UmbracoSettings;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Provides extension methods for the <see cref="Configs"/> class.
+    /// </summary>
+    public static class ConfigsExtensions
+    {
+        public static IGlobalSettings Global(this Configs configs)
+            => configs.GetConfig<IGlobalSettings>();
+
+        public static IUmbracoSettingsSection Settings(this Configs configs)
+            => configs.GetConfig<IUmbracoSettingsSection>();
+
+        public static IHealthChecks HealthChecks(this Configs configs)
+            => configs.GetConfig<IHealthChecks>();
+
+        public static IGridConfig Grids(this Configs configs)
+            => configs.GetConfig<IGridConfig>();
+
+        public static CoreDebug CoreDebug(this Configs configs)
+            => configs.GetConfig<CoreDebug>();
+    }
+}
diff --git a/src/Umbraco.Configuration/ConfigsFactory.cs b/src/Umbraco.Configuration/ConfigsFactory.cs
new file mode 100644
index 0000000000..fbfefc132e
--- /dev/null
+++ b/src/Umbraco.Configuration/ConfigsFactory.cs
@@ -0,0 +1,21 @@
+using System.Configuration;
+using Umbraco.Core.Configuration.HealthChecks;
+using Umbraco.Core.Configuration.UmbracoSettings;
+
+namespace Umbraco.Core.Configuration
+{
+    public class ConfigsFactory : IConfigsFactory
+    {
+        public Configs Create() {
+            var configs =  new Configs(section => ConfigurationManager.GetSection(section));
+            configs.Add<IGlobalSettings>(() => new GlobalSettings());
+            configs.Add<IUmbracoSettingsSection>("umbracoConfiguration/settings");
+            configs.Add<IHealthChecks>("umbracoConfiguration/HealthChecks");
+
+            configs.Add(() => new CoreDebug());
+            configs.Add<IHealthChecks>("umbracoConfiguration/HealthChecks");
+            configs.AddCoreConfigs();
+            return configs;
+        }
+    }
+}
diff --git a/src/Umbraco.Core/Configuration/CoreDebug.cs b/src/Umbraco.Configuration/CoreDebug.cs
similarity index 97%
rename from src/Umbraco.Core/Configuration/CoreDebug.cs
rename to src/Umbraco.Configuration/CoreDebug.cs
index aa95a25990..e81ca14873 100644
--- a/src/Umbraco.Core/Configuration/CoreDebug.cs
+++ b/src/Umbraco.Configuration/CoreDebug.cs
@@ -3,7 +3,7 @@ using System.Configuration;
 
 namespace Umbraco.Core.Configuration
 {
-    internal class CoreDebug
+    public class CoreDebug
     {
         public CoreDebug()
         {
diff --git a/src/Umbraco.Core/Configuration/InnerTextConfigurationElement.cs b/src/Umbraco.Configuration/InnerTextConfigurationElement.cs
similarity index 96%
rename from src/Umbraco.Core/Configuration/InnerTextConfigurationElement.cs
rename to src/Umbraco.Configuration/InnerTextConfigurationElement.cs
index 6a125f2c1b..3ff0c4d735 100644
--- a/src/Umbraco.Core/Configuration/InnerTextConfigurationElement.cs
+++ b/src/Umbraco.Configuration/InnerTextConfigurationElement.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Core.Configuration
     /// {element}MyValue{/element} instead of as attribute values.
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    internal class InnerTextConfigurationElement<T> : RawXmlConfigurationElement
+    public class InnerTextConfigurationElement<T> : RawXmlConfigurationElement
     {
         public InnerTextConfigurationElement()
         {
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingElement.cs b/src/Umbraco.Configuration/UmbracoSettings/ContentImagingElement.cs
similarity index 91%
rename from src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingElement.cs
rename to src/Umbraco.Configuration/UmbracoSettings/ContentImagingElement.cs
index 67562c411a..91eb180d08 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/ContentImagingElement.cs
+++ b/src/Umbraco.Configuration/UmbracoSettings/ContentImagingElement.cs
@@ -2,7 +2,7 @@
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    internal class ContentImagingElement : ConfigurationElement
+    public class ContentImagingElement : ConfigurationElement
     {
 
         [ConfigurationProperty("imageFileTypes")]
@@ -12,7 +12,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
                 //set the default
                 GetDefaultImageFileTypes());
 
-        internal static string[] GetDefaultImageFileTypes()
+        public static string[] GetDefaultImageFileTypes()
         {
             return new[] {"jpeg", "jpg", "gif", "bmp", "png", "tiff", "tif"};
         }
@@ -49,7 +49,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
             }
         }
 
-        internal static ImagingAutoFillPropertiesCollection GetDefaultImageAutoFillProperties()
+        public static ImagingAutoFillPropertiesCollection GetDefaultImageAutoFillProperties()
         {
             return new ImagingAutoFillPropertiesCollection
                         {
diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/RequestHandlerElement.cs b/src/Umbraco.Configuration/UmbracoSettings/RequestHandlerElement.cs
similarity index 95%
rename from src/Umbraco.Core/Configuration/UmbracoSettings/RequestHandlerElement.cs
rename to src/Umbraco.Configuration/UmbracoSettings/RequestHandlerElement.cs
index 263a822381..e5350bf596 100644
--- a/src/Umbraco.Core/Configuration/UmbracoSettings/RequestHandlerElement.cs
+++ b/src/Umbraco.Configuration/UmbracoSettings/RequestHandlerElement.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    internal class RequestHandlerElement : UmbracoConfigurationElement, IRequestHandlerSection
+    public class RequestHandlerElement : UmbracoConfigurationElement, IRequestHandlerSection
     {
         [ConfigurationProperty("addTrailingSlash")]
         public InnerTextConfigurationElement<bool> AddTrailingSlash => GetOptionalTextElement("addTrailingSlash", true);
@@ -38,7 +38,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
             }
         }
 
-        internal static CharCollection GetDefaultCharReplacements()
+        public static CharCollection GetDefaultCharReplacements()
         {
             var dictionary = new Dictionary<char, string>()
                         {
diff --git a/src/Umbraco.Core/ConfigsExtensions.cs b/src/Umbraco.Core/ConfigsExtensions.cs
deleted file mode 100644
index 5699540389..0000000000
--- a/src/Umbraco.Core/ConfigsExtensions.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System.IO;
-using Umbraco.Core.Cache;
-using Umbraco.Core.Composing;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Configuration.Grid;
-using Umbraco.Core.Configuration.HealthChecks;
-using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.IO;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Manifest;
-
-namespace Umbraco.Core
-{
-    /// <summary>
-    /// Provides extension methods for the <see cref="Configs"/> class.
-    /// </summary>
-    public static class ConfigsExtensions
-    {
-        public static IGlobalSettings Global(this Configs configs)
-            => configs.GetConfig<IGlobalSettings>();
-
-        public static IUmbracoSettingsSection Settings(this Configs configs)
-            => configs.GetConfig<IUmbracoSettingsSection>();
-
-        public static IHealthChecks HealthChecks(this Configs configs)
-            => configs.GetConfig<IHealthChecks>();
-
-        public static IGridConfig Grids(this Configs configs)
-            => configs.GetConfig<IGridConfig>();
-
-        internal static CoreDebug CoreDebug(this Configs configs)
-            => configs.GetConfig<CoreDebug>();
-
-        public static void AddCoreConfigs(this Configs configs)
-        {
-            var configDir = new DirectoryInfo(IOHelper.MapPath(SystemDirectories.Config));
-
-            configs.Add<IGlobalSettings>(() => new GlobalSettings());
-            configs.Add<IUmbracoSettingsSection>("umbracoConfiguration/settings");
-            configs.Add<IHealthChecks>("umbracoConfiguration/HealthChecks");
-
-            configs.Add(() => new CoreDebug());
-
-            // GridConfig depends on runtime caches, manifest parsers... and cannot be available during composition
-            configs.Add<IGridConfig>(factory => new GridConfig(
-                factory.GetInstance<ILogger>(),
-                factory.GetInstance<AppCaches>(),
-                configDir,
-                factory.GetInstance<IManifestParser>(),
-                factory.GetInstance<IRuntimeState>().Debug));
-        }
-    }
-}
diff --git a/src/Umbraco.Core/Configuration/ConfigsFactory.cs b/src/Umbraco.Core/Configuration/ConfigsFactory.cs
deleted file mode 100644
index aeeef1e653..0000000000
--- a/src/Umbraco.Core/Configuration/ConfigsFactory.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration
-{
-    public class ConfigsFactory : IConfigsFactory
-    {
-        public Configs Create() {
-            var configs =  new Configs(section => ConfigurationManager.GetSection(section));
-            configs.AddCoreConfigs();
-            return configs;
-        }
-    }
-}