diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs
index d2ead037..8571c720 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs	
@@ -1259,11 +1259,11 @@ namespace PepperDash.Essentials.Core.Fusion
             {
                 //Setup Display Usage Monitoring
 
-                var displays = DeviceManager.AllDevices.Where(d => d is DisplayBase);
+                var displays = DeviceManager.AllDevices.Where(d => d is TwoWayDisplayBase);
 
                 //  Consider updating this in multiple display systems
 
-                foreach (var display in displays.Cast<DisplayBase>())
+                foreach (var display in displays.Cast<TwoWayDisplayBase>())
                 {
                     display.UsageTracker = new UsageTracking(display) {UsageIsTracked = true};
                     display.UsageTracker.DeviceUsageEnded +=
@@ -1276,7 +1276,7 @@ namespace PepperDash.Essentials.Core.Fusion
                     return;
                 }
 
-                var defaultDisplay = hasDefaultDisplay.DefaultDisplay as DisplayBase;
+                var defaultDisplay = hasDefaultDisplay.DefaultDisplay as TwoWayDisplayBase;
                 if (defaultDisplay == null)
                 {
                     Debug.Console(1, this, "Cannot link null display to Fusion because default display is null");
@@ -1326,7 +1326,7 @@ namespace PepperDash.Essentials.Core.Fusion
         /// <param name="display"></param>
         /// <param name="displayIndex"></param>
         /// a
-        protected virtual void MapDisplayToRoomJoins(int displayIndex, int joinOffset, DisplayBase display)
+        protected virtual void MapDisplayToRoomJoins(int displayIndex, int joinOffset, TwoWayDisplayBase display)
         {
             var displayName = string.Format("Display {0} - ", displayIndex);
 
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleVtc1FusionController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleVtc1FusionController.cs
index fe16f5cb..ba23ecfc 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleVtc1FusionController.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleVtc1FusionController.cs	
@@ -154,7 +154,7 @@ namespace PepperDash.Essentials.Core.Fusion
         {
             base.SetUpDisplay();
 
-            var defaultDisplay = _room.DefaultDisplay as DisplayBase;
+            var defaultDisplay = _room.DefaultDisplay as TwoWayDisplayBase;
 
             if (defaultDisplay == null)
             {
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index 94e0e7a2..b70062a0 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
@@ -186,19 +186,17 @@
     <Compile Include="Device Info\DeviceInfo.cs" />
     <Compile Include="Device Info\DeviceInfoEventArgs.cs" />
     <Compile Include="Device Info\IDeviceInfoProvider.cs" />
-    <Compile Include="Devices\AudioCodecBase.cs" />
-    <Compile Include="Devices\CodecInterfaces.cs" />
     <Compile Include="Devices\Base Classes\AudioCodecBase.cs" />
+    <Compile Include="Devices\Base Classes\EssentialsBridgeableDevice.cs" />
+    <Compile Include="Devices\Base Classes\EssentialsDevice.cs" />
     <Compile Include="Devices\Interfaces\CodecInterfaces.cs" />
     <Compile Include="Devices\CrestronProcessor.cs" />
     <Compile Include="Devices\DestinationListItem.cs" />
     <Compile Include="Devices\Base Classes\DeviceApiBase.cs" />
     <Compile Include="Devices\DeviceFeedbackExtensions.cs" />
-    <Compile Include="Devices\EssentialsBridgeableDevice.cs" />
-    <Compile Include="Devices\EssentialsDevice.cs" />
     <Compile Include="Devices\GenericIRController.cs" />
     <Compile Include="Devices\IDspPreset.cs" />
-    <Compile Include="Devices\IProjectorInterfaces.cs" />
+    <Compile Include="Devices\Interfaces\IProjectorInterfaces.cs" />
     <Compile Include="Devices\PC\InRoomPc.cs" />
     <Compile Include="Devices\PC\Laptop.cs" />
     <Compile Include="Devices\Base Classes\ReconfigurableDevice.cs" />
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/EssentialsRoomBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/EssentialsRoomBase.cs
index d5d77fe4..2d2ce439 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/EssentialsRoomBase.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/EssentialsRoomBase.cs	
@@ -241,7 +241,7 @@ namespace PepperDash.Essentials.Core
             ShutdownType = eShutdownType.None;
         }
 
-        protected void InitializeDisplay(DisplayBase display)
+        protected void InitializeDisplay(TwoWayDisplayBase display)
         {
             // Link power, warming, cooling to display
             display.PowerIsOnFeedback.OutputChange += PowerIsOnFeedbackOnOutputChange;
@@ -615,9 +615,9 @@ namespace PepperDash.Essentials.Core
             if (route.SourceKey.Equals("$off", StringComparison.OrdinalIgnoreCase))
             {
                 dest.ReleaseRoute();
-                if (dest is IPower)
+                if (dest is IHasPowerControl)
                 {
-                    (dest as IPower).PowerOff();
+                    (dest as IHasPowerControl).PowerOff();
                 }
             }
             else
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsDualDisplayRoom.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsDualDisplayRoom.cs
index b10370a7..2ba4930a 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsDualDisplayRoom.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsDualDisplayRoom.cs	
@@ -210,8 +210,8 @@ namespace PepperDash.Essentials
                 return;
             }
 
-            var leftDisplay = leftDest.SinkDevice as DisplayBase;
-            var rightDisplay = rightDest.SinkDevice as DisplayBase;
+            var leftDisplay = leftDest.SinkDevice as TwoWayDisplayBase;
+            var rightDisplay = rightDest.SinkDevice as TwoWayDisplayBase;
 
             if (leftDisplay == null || rightDisplay == null)
             {
@@ -279,8 +279,8 @@ namespace PepperDash.Essentials
 
         protected override void PowerIsOnFeedbackOnOutputChange(object sender, FeedbackEventArgs args)
         {
-            var ld = LeftDisplay as DisplayBase;
-            var rd = RightDisplay as DisplayBase;
+            var ld = LeftDisplay as TwoWayDisplayBase;
+            var rd = RightDisplay as TwoWayDisplayBase;
 
             if (ld == null || rd == null)
             {
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsHuddleSpaceRoom.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsHuddleSpaceRoom.cs
index eb332e98..f521cc5b 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsHuddleSpaceRoom.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsHuddleSpaceRoom.cs	
@@ -52,7 +52,7 @@ namespace PepperDash.Essentials
 
             EnablePowerOnToLastSource = true;
 
-            var disp = DefaultDisplay as DisplayBase;
+            var disp = DefaultDisplay as TwoWayDisplayBase;
             if (disp == null)
             {
                 return;
@@ -75,7 +75,7 @@ namespace PepperDash.Essentials
 
         protected override void PowerIsOnFeedbackOnOutputChange(object sender, FeedbackEventArgs feedbackEventArgs)
         {
-            var display = sender as DisplayBase;
+            var display = sender as TwoWayDisplayBase;
 
             if (display == null)
             {
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsHuddleVtc1Room.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsHuddleVtc1Room.cs
index 29ea4a56..ffae7724 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsHuddleVtc1Room.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsHuddleVtc1Room.cs	
@@ -195,7 +195,7 @@ namespace PepperDash.Essentials
                 SourceListKey = "default";
                 EnablePowerOnToLastSource = true;
 
-                var disp = DefaultDisplay as DisplayBase;
+                var disp = DefaultDisplay as TwoWayDisplayBase;
                 if (disp == null)
                 {
                     return;
@@ -272,7 +272,7 @@ namespace PepperDash.Essentials
 
         protected override void PowerIsOnFeedbackOnOutputChange(object sender, FeedbackEventArgs args)
         {
-            var disp = sender as DisplayBase;
+            var disp = sender as TwoWayDisplayBase;
 
             if (disp == null)
             {
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodecPropertiesConfig.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodecPropertiesConfig.cs
index 1836bafb..cbcdb5aa 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodecPropertiesConfig.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodecPropertiesConfig.cs	
@@ -8,6 +8,7 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 
 using Newtonsoft.Json;
+using PepperDash.Essentials.Core.Devices.Codec;
 
 namespace PepperDash.Essentials.Devices.Common.Codec
 {
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs
index 817d5c03..d1ee7f7a 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs	
@@ -11,7 +11,6 @@ using PepperDash.Essentials.Core.Devices.Codec;
 
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 {
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
index c7bbb850..2c94c792 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs	
@@ -12,10 +12,12 @@ using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Devices.VideoCodec;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Core.Devices.Codec;
 using PepperDash.Essentials.Devices.Core.VideoCodec;
+using PepperDash_Essentials_Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 {