diff --git a/src/Pepperdash.Core/CoreInterfaces.cs b/src/Pepperdash.Core/CoreInterfaces.cs
deleted file mode 100644
index c1432c2..0000000
--- a/src/Pepperdash.Core/CoreInterfaces.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Serilog;
-
-namespace PepperDash.Core
-{
-    /// <summary>
-    /// Unique key interface to require a unique key for the class
-    /// </summary>
-	public interface IKeyed
-	{
-        /// <summary>
-        /// Unique Key
-        /// </summary>
-		string Key { get; }
-    }
-
-    /// <summary>
-    /// Named Keyed device interface. Forces the device to have a Unique Key and a name. 
-    /// </summary>
-	public interface IKeyName : IKeyed
-    {
-        /// <summary>
-        /// Isn't it obvious :)
-        /// </summary>
-		string Name { get; }
-    }
-
-}
\ No newline at end of file
diff --git a/src/Pepperdash.Core/IKeyName.cs b/src/Pepperdash.Core/IKeyName.cs
new file mode 100644
index 0000000..21569a0
--- /dev/null
+++ b/src/Pepperdash.Core/IKeyName.cs
@@ -0,0 +1,15 @@
+namespace PepperDash.Core
+{
+
+    /// <summary>
+    /// Named Keyed device interface. Forces the device to have a Unique Key and a name. 
+    /// </summary>
+	public interface IKeyName : IKeyed
+    {
+        /// <summary>
+        /// Isn't it obvious :)
+        /// </summary>
+		string Name { get; }
+    }
+
+}
\ No newline at end of file
diff --git a/src/Pepperdash.Core/IKeyed.cs b/src/Pepperdash.Core/IKeyed.cs
new file mode 100644
index 0000000..383cbdf
--- /dev/null
+++ b/src/Pepperdash.Core/IKeyed.cs
@@ -0,0 +1,14 @@
+namespace PepperDash.Core
+{
+    /// <summary>
+    /// Unique key interface to require a unique key for the class
+    /// </summary>
+    public interface IKeyed
+	{
+        /// <summary>
+        /// Unique Key
+        /// </summary>
+		string Key { get; }
+    }
+
+}
\ No newline at end of file