diff --git a/src/PepperDash.Essentials.Core/Devices/FIND HOMES Interfaces.cs b/src/PepperDash.Essentials.Core/Devices/FIND HOMES Interfaces.cs
deleted file mode 100644
index 44b36134..00000000
--- a/src/PepperDash.Essentials.Core/Devices/FIND HOMES Interfaces.cs	
+++ /dev/null
@@ -1,35 +0,0 @@
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
- /// <summary>
- /// Defines the contract for IOnline
- /// </summary>
-	public interface IOnline
-	{
-		BoolFeedback IsOnline { get; }
-	}
-
- /// <summary>
- /// Defines the contract for IAttachVideoStatus
- /// </summary>
-	public interface IAttachVideoStatus : IKeyed
-	{
-		// Extension methods will depend on this
-	}
-
-	/// <summary>
-	/// For display classes that can provide usage data
-	/// </summary>
-	public interface IDisplayUsage
-	{
-		IntFeedback LampHours { get; }
-	}
-
-	public interface IMakeModel : IKeyed
-	{
-		string DeviceMake { get; }
-		string DeviceModel { get; }
-	}
-}
\ No newline at end of file
diff --git a/src/PepperDash.Essentials.Core/Devices/IAttachVideoStatus.cs b/src/PepperDash.Essentials.Core/Devices/IAttachVideoStatus.cs
new file mode 100644
index 00000000..4b9b36ca
--- /dev/null
+++ b/src/PepperDash.Essentials.Core/Devices/IAttachVideoStatus.cs
@@ -0,0 +1,13 @@
+using PepperDash.Core;
+
+
+namespace PepperDash.Essentials.Core
+{
+  /// <summary>
+  /// Defines the contract for IAttachVideoStatus
+  /// </summary>
+  public interface IAttachVideoStatus : IKeyed
+  {
+    // Extension methods will depend on this
+  }
+}
\ No newline at end of file
diff --git a/src/PepperDash.Essentials.Core/Devices/IDisplayUsage.cs b/src/PepperDash.Essentials.Core/Devices/IDisplayUsage.cs
new file mode 100644
index 00000000..0d74d819
--- /dev/null
+++ b/src/PepperDash.Essentials.Core/Devices/IDisplayUsage.cs
@@ -0,0 +1,10 @@
+namespace PepperDash.Essentials.Core
+{
+  /// <summary>
+  /// For display classes that can provide usage data
+  /// </summary>
+  public interface IDisplayUsage
+  {
+    IntFeedback LampHours { get; }
+  }
+}
\ No newline at end of file
diff --git a/src/PepperDash.Essentials.Core/Devices/IMakeModel.cs b/src/PepperDash.Essentials.Core/Devices/IMakeModel.cs
new file mode 100644
index 00000000..494c9af3
--- /dev/null
+++ b/src/PepperDash.Essentials.Core/Devices/IMakeModel.cs
@@ -0,0 +1,22 @@
+using PepperDash.Core;
+
+
+namespace PepperDash.Essentials.Core
+{
+
+	/// <summary>
+	/// Defines the contract for device make and model information
+	/// </summary>
+	public interface IMakeModel : IKeyed
+	{
+		/// <summary>
+		/// Gets the make of the device
+		/// </summary>
+		string DeviceMake { get; }
+
+		/// <summary>
+		/// Gets the model of the device
+		/// </summary>
+		string DeviceModel { get; }
+	}
+}
\ No newline at end of file
diff --git a/src/PepperDash.Essentials.Core/Devices/IOnline.cs b/src/PepperDash.Essentials.Core/Devices/IOnline.cs
new file mode 100644
index 00000000..8c86a480
--- /dev/null
+++ b/src/PepperDash.Essentials.Core/Devices/IOnline.cs
@@ -0,0 +1,13 @@
+namespace PepperDash.Essentials.Core
+{
+  /// <summary>
+  /// Defines the contract for IOnline
+  /// </summary>
+  public interface IOnline
+  {
+    /// <summary>
+    /// Gets a value indicating whether the device is online.
+    /// </summary>
+    BoolFeedback IsOnline { get; }
+  }
+}
\ No newline at end of file