diff --git a/src/Umbraco.Core/Compose/CompositionExtensions.cs b/src/Umbraco.Core/CompositionExtensions_Accessors.cs
similarity index 99%
rename from src/Umbraco.Core/Compose/CompositionExtensions.cs
rename to src/Umbraco.Core/CompositionExtensions_Accessors.cs
index 4767797dc1..f19437809e 100644
--- a/src/Umbraco.Core/Compose/CompositionExtensions.cs
+++ b/src/Umbraco.Core/CompositionExtensions_Accessors.cs
@@ -11,12 +11,12 @@ using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Strings;
 using Umbraco.Core.Sync;
 
-namespace Umbraco.Core.Compose
+namespace Umbraco.Core
 {
     /// <summary>
     /// Provides extension methods to the <see cref="Composition"/> class.
     /// </summary>
-    public static class CompositionExtensions
+    public static partial class CompositionExtensions
     {
         #region FileSystems
 
diff --git a/src/Umbraco.Core/CompositionExtensions.cs b/src/Umbraco.Core/CompositionExtensions_Essentials.cs
similarity index 97%
rename from src/Umbraco.Core/CompositionExtensions.cs
rename to src/Umbraco.Core/CompositionExtensions_Essentials.cs
index 46e8111237..46575c1428 100644
--- a/src/Umbraco.Core/CompositionExtensions.cs
+++ b/src/Umbraco.Core/CompositionExtensions_Essentials.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Core
     /// <summary>
     /// Provides extension methods to the <see cref="Composition"/> class.
     /// </summary>
-    public static class CompositionExtensions
+    public static partial class CompositionExtensions
     {
         #region Essentials
 
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index bd3d64254d..29bc0ef62d 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -161,7 +161,7 @@
     <Compile Include="Composing\ComponentComposer.cs" />
     <Compile Include="Composing\Composers.cs" />
     <Compile Include="Composing\Composition.cs" />
-    <Compile Include="Compose\CompositionExtensions.cs" />
+    <Compile Include="CompositionExtensions_Accessors.cs" />
     <Compile Include="Composing\DisableAttribute.cs" />
     <Compile Include="Composing\DisableComposerAttribute.cs" />
     <Compile Include="Composing\EnableAttribute.cs" />
@@ -186,7 +186,7 @@
     <Compile Include="Composing\CompositionExtensions\FileSystems.cs" />
     <Compile Include="Composing\CompositionExtensions\Repositories.cs" />
     <Compile Include="Composing\CompositionExtensions\Services.cs" />
-    <Compile Include="CompositionExtensions.cs" />
+    <Compile Include="CompositionExtensions_Essentials.cs" />
     <Compile Include="FactoryExtensions.cs" />
     <Compile Include="Composing\RegisterFactory.cs" />
     <Compile Include="Composing\Current.cs" />