diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index 842c229c..4506340c 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj	
@@ -269,24 +269,24 @@
     <Compile Include="Remotes\ButtonExtensions.cs" />
     <Compile Include="Remotes\CrestronRemotePropertiesConfig.cs" />
     <Compile Include="Remotes\Hrxx0WirelessRemoteController.cs" />
-    <Compile Include="Room\Behaviours\RoomOnToDefaultSourceWhenOccupied.cs" />
-    <Compile Include="Room\Config\DDVC01RoomPropertiesConfig.cs" />
-    <Compile Include="Room\Config\EssentialsDualDisplayRoomPropertiesConfig.cs" />
-    <Compile Include="Room\Config\EssentialsHuddleRoomPropertiesConfig.cs" />
-    <Compile Include="Room\Config\EssentialsHuddleVtc1PropertiesConfig.cs" />
-    <Compile Include="Room\Config\EssentialsNDisplayRoomPropertiesConfig.cs" />
-    <Compile Include="Room\Config\EssentialsPresentationPropertiesConfig.cs" />
-    <Compile Include="Room\Config\EssentialsVolumeLevelConfig.cs" />
-    <Compile Include="Room\Emergency\EsentialsRoomEmergencyContactClosure.cs" />
-    <Compile Include="Room\EssentialsRoomBase.cs" />
-    <Compile Include="Room\Config\EssentialsRoomConfig.cs" />
-    <Compile Include="Room\Config\EssentialsRoomEmergencyConfig.cs" />
-    <Compile Include="Room\Interfaces.cs" />
-    <Compile Include="Room\iOccupancyStatusProvider.cs" />
-    <Compile Include="Room\Types\EssentialsDualDisplayRoom.cs" />
-    <Compile Include="Room\Types\EssentialsHuddleSpaceRoom.cs" />
-    <Compile Include="Room\Types\EssentialsHuddleVtc1Room.cs" />
-    <Compile Include="Room\Types\EssentialsNDisplayRoomBase.cs" />
+    <Compile Include="Rooms\Behaviours\RoomOnToDefaultSourceWhenOccupied.cs" />
+    <Compile Include="Rooms\Config\DDVC01RoomPropertiesConfig.cs" />
+    <Compile Include="Rooms\Config\EssentialsDualDisplayRoomPropertiesConfig.cs" />
+    <Compile Include="Rooms\Config\EssentialsHuddleRoomPropertiesConfig.cs" />
+    <Compile Include="Rooms\Config\EssentialsHuddleVtc1PropertiesConfig.cs" />
+    <Compile Include="Rooms\Config\EssentialsNDisplayRoomPropertiesConfig.cs" />
+    <Compile Include="Rooms\Config\EssentialsPresentationPropertiesConfig.cs" />
+    <Compile Include="Rooms\Config\EssentialsVolumeLevelConfig.cs" />
+    <Compile Include="Rooms\Emergency\EsentialsRoomEmergencyContactClosure.cs" />
+    <Compile Include="Rooms\EssentialsRoomBase.cs" />
+    <Compile Include="Rooms\Config\EssentialsRoomConfig.cs" />
+    <Compile Include="Rooms\Config\EssentialsRoomEmergencyConfig.cs" />
+    <Compile Include="Rooms\Interfaces.cs" />
+    <Compile Include="Rooms\iOccupancyStatusProvider.cs" />
+    <Compile Include="Rooms\Types\EssentialsDualDisplayRoom.cs" />
+    <Compile Include="Rooms\Types\EssentialsHuddleSpaceRoom.cs" />
+    <Compile Include="Rooms\Types\EssentialsHuddleVtc1Room.cs" />
+    <Compile Include="Rooms\Types\EssentialsNDisplayRoomBase.cs" />
     <Compile Include="Routing\DummyRoutingInputsDevice.cs" />
     <Compile Include="Routing\ICardPortsDevice.cs" />
     <Compile Include="InUseTracking\IInUseTracking.cs" />
@@ -344,7 +344,7 @@
     <Compile Include="Devices\IrOutputPortController.cs" />
     <Compile Include="Display\DisplayBase.cs" />
     <Compile Include="Feedbacks\FeedbackBase.cs" />
-    <Compile Include="Room\Room.cs" />
+    <Compile Include="Rooms\Room.cs" />
     <Compile Include="SmartObjects\SubpageReferencList\SourceListSubpageReferenceList.cs" />
     <Compile Include="Touchpanels\ModalDialog.cs" />
     <Compile Include="TriListBridges\HandlerBridge.cs" />