diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IHasVideoCodec.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IHasVideoCodec.cs
index 3895b9eb..d4022dfc 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IHasVideoCodec.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IHasVideoCodec.cs	
@@ -1,4 +1,6 @@
-namespace PepperDash.Essentials.Core.Devices.VideoCodec
+using PepperDash.Essentials.Devices.Common.VideoCodec;
+
+namespace PepperDash.Essentials.Core.Devices.VideoCodec
 {
 	/// <summary>
 	/// For rooms that have video codec
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/CameraBase.cs
similarity index 100%
rename from essentials-framework/Essentials Devices Common/Essentials Devices Common/Cameras/CameraBase.cs
rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/CameraBase.cs
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 016379b3..ca874190 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/VideoCodecBase.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/VideoCodecBase.cs	
@@ -18,6 +18,7 @@ using PepperDash.Essentials.Core.Devices;
 using PepperDash.Essentials.Core.Devices.Codec;
 using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 using PepperDash.Essentials.Core.Routing;
+using PepperDash.Essentials.Devices.Common.Cameras;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
 using PepperDash.Essentials.Devices.Core.VideoCodec;
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index df48a9d3..283df563 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
@@ -187,6 +187,7 @@
     <Compile Include="Device Info\DeviceInfoEventArgs.cs" />
     <Compile Include="Device Info\IDeviceInfoProvider.cs" />
     <Compile Include="Devices\Base Classes\AudioCodecBase.cs" />
+    <Compile Include="Devices\Base Classes\CameraBase.cs" />
     <Compile Include="Devices\Base Classes\EssentialsBridgeableDevice.cs" />
     <Compile Include="Devices\Base Classes\EssentialsDevice.cs" />
     <Compile Include="Devices\CodecCommandWithLabel.cs" />
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsDualDisplayRoom.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsDualDisplayRoom.cs
index 18861c7e..d19ef143 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsDualDisplayRoom.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsDualDisplayRoom.cs	
@@ -9,6 +9,7 @@ using PepperDash.Essentials.Core.Devices.VideoCodec;
 using PepperDash.Essentials.Core.Rooms;
 using PepperDash.Essentials.Core.Rooms.Config;
 using PepperDash.Essentials.Core.Devices;
+using PepperDash.Essentials.Devices.Common.VideoCodec;
 
 namespace PepperDash.Essentials
 {
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj
index 033c4e05..a49ec402 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj	
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj	
@@ -97,7 +97,6 @@
   <ItemGroup>
     <Compile Include="AudioCodec\MockAC\MockAC.cs" />
     <Compile Include="AudioCodec\MockAC\MockAcPropertiesConfig.cs" />
-    <Compile Include="Cameras\CameraBase.cs" />
     <Compile Include="Cameras\CameraVisca.cs" />
     <Compile Include="Cameras\IHasCameraPresets.cs" />
     <Compile Include="ImageProcessors\TVOneCorio.cs" />