diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index f3a35a13..b6024a39 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
@@ -182,19 +182,19 @@
     <Compile Include="Crestron IO\Relay\GenericRelayDevice.cs" />
     <Compile Include="Crestron IO\Relay\ISwitchedOutput.cs" />
     <Compile Include="Crestron IO\StatusSign\StatusSignController.cs" />
-    <Compile Include="Devices\AudioCodecBase.cs" />
-    <Compile Include="Devices\CodecInterfaces.cs" />
+    <Compile Include="Devices\Base Classes\AudioCodecBase.cs" />
+    <Compile Include="Devices\Interfaces\CodecInterfaces.cs" />
     <Compile Include="Devices\CrestronProcessor.cs" />
     <Compile Include="Devices\DestinationListItem.cs" />
-    <Compile Include="Devices\DeviceApiBase.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\IProjectorInterfaces.cs" />
+    <Compile Include="Devices\Base Classes\EssentialsBridgeableDevice.cs" />
+    <Compile Include="Devices\Base Classes\EssentialsDevice.cs" />
+    <Compile Include="Devices\Interfaces\IProjectorInterfaces.cs" />
     <Compile Include="Devices\PC\InRoomPc.cs" />
     <Compile Include="Devices\PC\Laptop.cs" />
-    <Compile Include="Devices\ReconfigurableDevice.cs" />
-    <Compile Include="Devices\VideoCodecBase.cs" />
+    <Compile Include="Devices\Base Classes\ReconfigurableDevice.cs" />
+    <Compile Include="Devices\Base Classes\VideoCodecBase.cs" />
     <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
     <Compile Include="DeviceTypeInterfaces\Codec\CodecActiveCallItem.cs" />
     <Compile Include="DeviceTypeInterfaces\Codec\eCodecCallDirection.cs" />
@@ -252,8 +252,8 @@
     <Compile Include="Config\InfoConfig.cs" />
     <Compile Include="Config\DeviceConfig.cs" />
     <Compile Include="Devices\DisplayUiConstants.cs" />
-    <Compile Include="Devices\IUsageTracking.cs" />
-    <Compile Include="Devices\DeviceJsonApi.cs" />
+    <Compile Include="Devices\Interfaces\IUsageTracking.cs" />
+    <Compile Include="Devices\Base Classes\DeviceJsonApi.cs" />
     <Compile Include="Devices\SourceListItem.cs" />
     <Compile Include="DeviceTypeInterfaces\IDisplayBasic.cs" />
     <Compile Include="DeviceTypeInterfaces\IDumbSource.cs" />
@@ -270,7 +270,7 @@
     <Compile Include="DeviceTypeInterfaces\ITransport.cs" />
     <Compile Include="Devices\GenericMonitoredTcpDevice.cs" />
     <Compile Include="DeviceTypeInterfaces\INumeric.cs" />
-    <Compile Include="Devices\IVolumeAndAudioInterfaces.cs" />
+    <Compile Include="Devices\Interfaces\IVolumeAndAudioInterfaces.cs" />
     <Compile Include="Display\BasicIrDisplay.cs" />
     <Compile Include="Feedbacks\BoolFeedbackOneShot.cs" />
     <Compile Include="Ramps and Increments\NumericalHelpers.cs" />
@@ -306,10 +306,10 @@
     <Compile Include="Monitoring\StatusMonitorBase.cs" />
     <Compile Include="Monitoring\Interfaces.cs" />
     <Compile Include="Monitoring\GenericCommunicationMonitor.cs" />
-    <Compile Include="Devices\AudioInterfaces.cs" />
-    <Compile Include="Devices\IAttachVideoStatusExtensions.cs" />
-    <Compile Include="Devices\IHasFeedbacks.cs" />
-    <Compile Include="Devices\SmartObjectBaseTypes.cs" />
+    <Compile Include="Devices\Interfaces\AudioInterfaces.cs" />
+    <Compile Include="Devices\Interfaces\IAttachVideoStatusExtensions.cs" />
+    <Compile Include="Devices\Interfaces\IHasFeedbacks.cs" />
+    <Compile Include="Devices\Base Classes\SmartObjectBaseTypes.cs" />
     <Compile Include="Devices\PresentationDeviceType.cs" />
     <Compile Include="Display\MockDisplay.cs" />
     <Compile Include="Ethernet\EthernetStatistics.cs" />
@@ -357,7 +357,7 @@
     <Compile Include="SmartObjects\SubpageReferencList\SourceListSubpageReferenceList.cs" />
     <Compile Include="Touchpanels\ModalDialog.cs" />
     <Compile Include="TriListBridges\HandlerBridge.cs" />
-    <Compile Include="Devices\FIND HOMES Interfaces.cs" />
+    <Compile Include="Devices\Interfaces\Interfaces.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SigHelper.cs" />
     <Compile Include="SmartObjects\SubpageReferencList\SubpageReferenceList.cs" />