diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/Codec/IHasSelfviewPosition.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/Codec/IHasSelfviewPosition.cs
index 5360b80a..d18ff240 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/Codec/IHasSelfviewPosition.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/Codec/IHasSelfviewPosition.cs	
@@ -1,5 +1,5 @@
 using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Devices.Common.VideoCodec.Cisco;
+using PepperDash.Essentials.Core.Devices;
 
 namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
 {
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/Codec/iHasDirectory.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/Codec/iHasDirectory.cs
index 3a59b62d..ca85709d 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/Codec/iHasDirectory.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/Codec/iHasDirectory.cs	
@@ -10,6 +10,7 @@ using Newtonsoft.Json.Converters;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Devices.VideoCodec;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
 
 namespace PepperDash.Essentials.Devices.Common.Codec
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/VideoCodecBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/VideoCodecBase.cs
index e7053320..1c31ab20 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/VideoCodecBase.cs	
@@ -6,6 +6,7 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
 using PepperDash.Essentials.Core.Routing;
 using PepperDash.Essentials.Core.Devices.Codec;
+using PepperDash.Essentials.Devices.Common.Codec;
 
 namespace PepperDash.Essentials.Core.Devices.VideoCodec
 {
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/CodecCommandWithLabel.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/CodecCommandWithLabel.cs
new file mode 100644
index 00000000..723b5087
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/CodecCommandWithLabel.cs	
@@ -0,0 +1,17 @@
+namespace PepperDash.Essentials.Core.Devices
+{
+    /// <summary>
+    /// Represents a codec command that might need to have a friendly label applied for UI feedback purposes
+    /// </summary>
+    public class CodecCommandWithLabel
+    {
+        public string Command { get; set; }
+        public string Label { get; set; }
+
+        public CodecCommandWithLabel(string command, string label)
+        {
+            Command = command;
+            Label = label;
+        }
+    }
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index 6e53a98d..03f9f1a0 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
@@ -189,6 +189,7 @@
     <Compile Include="Devices\Base Classes\AudioCodecBase.cs" />
     <Compile Include="Devices\Base Classes\EssentialsBridgeableDevice.cs" />
     <Compile Include="Devices\Base Classes\EssentialsDevice.cs" />
+    <Compile Include="Devices\CodecCommandWithLabel.cs" />
     <Compile Include="Devices\Interfaces\CodecInterfaces.cs" />
     <Compile Include="Devices\CrestronProcessor.cs" />
     <Compile Include="Devices\DestinationListItem.cs" />
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/SoftCodec/BlueJeansPc.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/SoftCodec/BlueJeansPc.cs
index 89b96ccc..90ab1081 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/SoftCodec/BlueJeansPc.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/SoftCodec/BlueJeansPc.cs	
@@ -14,7 +14,7 @@ using PepperDash.Essentials.Core.Config;
 
 namespace PepperDash.Essentials.Devices.Common.SoftCodec
 {
-    public class BlueJeansPc : InRoomPc, IRoutingInputs, IRunRouteAction, IRoutingSinkNoSwitching
+    public class BlueJeansPc : InRoomPc, IRunRouteAction, IRoutingSink
     {
 
         public RoutingInputPort AnyVideoIn { get; private set; }
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
index 6e69e96f..b8e285c7 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs	
@@ -13,6 +13,7 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Devices;
 using PepperDash.Essentials.Core.Devices.Codec;
 using PepperDash.Essentials.Core.Devices.VideoCodec;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
@@ -2000,22 +2001,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 		#endregion
 	}
 
-
-	/// <summary>
-    /// Represents a codec command that might need to have a friendly label applied for UI feedback purposes
-    /// </summary>
-    public class CodecCommandWithLabel
-    {
-        public string Command { get; set; }
-        public string Label { get; set; }
-
-        public CodecCommandWithLabel(string command, string label)
-        {
-            Command = command;
-            Label = label;
-        }
-    }
-
     /// <summary>
     /// Tracks the initial sycnronization state of the codec when making a connection
     /// </summary>
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/PhonebookDataClasses.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/PhonebookDataClasses.cs
index 7327a650..88a0f2c9 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/PhonebookDataClasses.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/PhonebookDataClasses.cs	
@@ -6,6 +6,7 @@ using Crestron.SimplSharp;
 
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Devices.Codec;
+using PepperDash.Essentials.Devices.Common.Codec;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec
 {
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/MockVC/MockCodecDirectory.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/MockVC/MockCodecDirectory.cs
index 6d24c8f3..5f8c246e 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/MockVC/MockCodecDirectory.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/MockVC/MockCodecDirectory.cs	
@@ -7,6 +7,7 @@ using Crestron.SimplSharp;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Devices.Codec;
+using PepperDash.Essentials.Devices.Common.Codec;
 
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/MockVC/MockVC.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/MockVC/MockVC.cs
index bb2d31ab..c91158f0 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/MockVC/MockVC.cs	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/MockVC/MockVC.cs	
@@ -15,6 +15,7 @@ using PepperDash.Essentials.Devices.Common.Cameras;
 
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using PepperDash.Essentials.Devices.Common.Codec;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec
 {
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 d1ee7f7a..7d173c1e 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,6 +11,8 @@ using PepperDash.Essentials.Core.Devices.Codec;
 
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using PepperDash.Essentials.Devices.Common.Codec;
+using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 {
@@ -259,9 +261,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
             /// <returns></returns>
             public static CodecDirectory ConvertZoomContactsToGeneric(List<Contact> zoomContacts)
             {
-                var directory = new Essentials.Core.Devices.Codec.CodecDirectory();
+                var directory = new CodecDirectory();
 
-                var folders = new List<Essentials.Core.Devices.Codec.DirectoryItem>();
+                var folders = new List<DirectoryItem>();
 
                 var roomFolder = new DirectoryFolder();
 
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 0e61e558..b9f402d8 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	
@@ -11,6 +11,7 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.Devices;
 using PepperDash.Essentials.Core.Devices.VideoCodec;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 using PepperDash.Essentials.Core.Routing;
@@ -19,7 +20,6 @@ using PepperDash.Essentials.Core.Devices.Codec;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
 using PepperDash.Essentials.Devices.Core.VideoCodec;
-using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 {