diff --git a/src/Umbraco.Core/Components/IComponent.cs b/src/Umbraco.Core/Components/IComponent.cs
new file mode 100644
index 0000000000..5ce9c02060
--- /dev/null
+++ b/src/Umbraco.Core/Components/IComponent.cs
@@ -0,0 +1,14 @@
+namespace Umbraco.Core.Components
+{
+    /// <summary>
+    /// Represents a component.
+    /// </summary>
+    /// <remarks>
+    /// <para>All components which are also disposable, will be disposed in reverse
+    /// order, when Umbraco terminates.</para>
+    /// <para>The Dispose method may be invoked more than once, and components
+    /// should ensure they support this.</para>
+    /// </remarks>
+    public interface IComponent
+    { }
+}
diff --git a/src/Umbraco.Core/Components/IComposer.cs b/src/Umbraco.Core/Components/IComposer.cs
new file mode 100644
index 0000000000..ce02aa4f13
--- /dev/null
+++ b/src/Umbraco.Core/Components/IComposer.cs
@@ -0,0 +1,16 @@
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core.Components
+{
+    /// <summary>
+    /// Represents a composer.
+    /// </summary>
+    public interface IComposer : IDiscoverable
+    {
+        /// <summary>
+        /// Compose.
+        /// </summary>
+        /// <param name="composition"></param>
+        void Compose(Composition composition);
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Components/ICoreComposer.cs b/src/Umbraco.Core/Components/ICoreComposer.cs
new file mode 100644
index 0000000000..810d9641be
--- /dev/null
+++ b/src/Umbraco.Core/Components/ICoreComposer.cs
@@ -0,0 +1,13 @@
+namespace Umbraco.Core.Components
+{
+    /// <summary>
+    /// Represents a core <see cref="IComposer"/>.
+    /// </summary>
+    /// <remarks>
+    /// <para>All core composers are required by (compose before) all user composers,
+    /// and require (compose after) all runtime composers.</para>
+    /// </remarks>
+    [Require(typeof(IRuntimeComposer))]
+    public interface ICoreComposer : IComposer
+    { }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Components/IRuntimeComposer.cs b/src/Umbraco.Core/Components/IRuntimeComposer.cs
new file mode 100644
index 0000000000..4b8253ee6c
--- /dev/null
+++ b/src/Umbraco.Core/Components/IRuntimeComposer.cs
@@ -0,0 +1,11 @@
+namespace Umbraco.Core.Components
+{
+    /// <summary>
+    /// Represents a runtime <see cref="IComposer"/>.
+    /// </summary>
+    /// <remarks>
+    /// <para>All runtime composers are required by (compose before) all core composers</para>
+    /// </remarks>
+    public interface IRuntimeComposer : IComposer
+    { }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Components/IUmbracoComponent.cs b/src/Umbraco.Core/Components/IUmbracoComponent.cs
deleted file mode 100644
index 149f41df83..0000000000
--- a/src/Umbraco.Core/Components/IUmbracoComponent.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Umbraco.Core.Composing;
-
-namespace Umbraco.Core.Components
-{
-    // FIXME BREAK THIS!
-
-    public interface IComposer : IDiscoverable
-    {
-        void Compose(Composition composition);
-    }
-
-    public interface IRuntimeComposer : IComposer
-    { }
-
-    [Require(typeof(IRuntimeComposer))]
-    public interface ICoreComposer : IComposer
-    { }
-
-    [Require(typeof(ICoreComposer))]
-    public interface IUserComposer : IComposer
-    { }
-
-    // will be disposed if disposable, CANT be disposed multiple times, beware!
-    public interface IComponent
-    { }
-}
diff --git a/src/Umbraco.Core/Components/IUserComposer.cs b/src/Umbraco.Core/Components/IUserComposer.cs
new file mode 100644
index 0000000000..ca8cfcaefb
--- /dev/null
+++ b/src/Umbraco.Core/Components/IUserComposer.cs
@@ -0,0 +1,12 @@
+namespace Umbraco.Core.Components
+{
+    /// <summary>
+    /// Represents a user <see cref="IComposer"/>.
+    /// </summary>
+    /// <remarks>
+    /// <para>All user composers require (compose after) all core composers.</para>
+    /// </remarks>
+    [Require(typeof(ICoreComposer))]
+    public interface IUserComposer : IComposer
+    { }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index a5a57df80e..425adc0b44 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -160,7 +160,11 @@
     <Compile Include="Components\CompositionExtensions.cs" />
     <Compile Include="Components\DisableAttribute.cs" />
     <Compile Include="Components\EnableAttribute.cs" />
-    <Compile Include="Components\IUmbracoComponent.cs" />
+    <Compile Include="Components\IComposer.cs" />
+    <Compile Include="Components\ICoreComposer.cs" />
+    <Compile Include="Components\IRuntimeComposer.cs" />
+    <Compile Include="Components\IComponent.cs" />
+    <Compile Include="Components\IUserComposer.cs" />
     <Compile Include="Components\ManifestWatcherComposer.cs" />
     <Compile Include="Components\RelateOnCopyComposer.cs" />
     <Compile Include="Components\RelateOnTrashComposer.cs" />