diff --git a/src/PepperDash.Essentials.Core/Crestron IO/GenericDigitalInputDevice.cs b/src/PepperDash.Essentials.Core/CrestronIO/GenericDigitalInputDevice.cs
similarity index 100%
rename from src/PepperDash.Essentials.Core/Crestron IO/GenericDigitalInputDevice.cs
rename to src/PepperDash.Essentials.Core/CrestronIO/GenericDigitalInputDevice.cs
diff --git a/src/PepperDash.Essentials.Core/Crestron IO/GenericRelayDevice.cs b/src/PepperDash.Essentials.Core/CrestronIO/GenericRelayDevice.cs
similarity index 100%
rename from src/PepperDash.Essentials.Core/Crestron IO/GenericRelayDevice.cs
rename to src/PepperDash.Essentials.Core/CrestronIO/GenericRelayDevice.cs
diff --git a/src/PepperDash.Essentials.Core/Crestron IO/GenericVersiportAnalogInputDevice.cs b/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportAnalogInputDevice.cs
similarity index 100%
rename from src/PepperDash.Essentials.Core/Crestron IO/GenericVersiportAnalogInputDevice.cs
rename to src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportAnalogInputDevice.cs
diff --git a/src/PepperDash.Essentials.Core/Crestron IO/GenericVersiportInputDevice.cs b/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportInputDevice.cs
similarity index 100%
rename from src/PepperDash.Essentials.Core/Crestron IO/GenericVersiportInputDevice.cs
rename to src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportInputDevice.cs
diff --git a/src/PepperDash.Essentials.Core/Crestron IO/GenericVersiportOutputDevice.cs b/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportOutputDevice.cs
similarity index 100%
rename from src/PepperDash.Essentials.Core/Crestron IO/GenericVersiportOutputDevice.cs
rename to src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportOutputDevice.cs
diff --git a/src/PepperDash.Essentials.Core/Crestron IO/IAnalogInput.cs b/src/PepperDash.Essentials.Core/CrestronIO/IAnalogInput.cs
similarity index 100%
rename from src/PepperDash.Essentials.Core/Crestron IO/IAnalogInput.cs
rename to src/PepperDash.Essentials.Core/CrestronIO/IAnalogInput.cs
diff --git a/src/PepperDash.Essentials.Core/Crestron IO/IDigitalInput.cs b/src/PepperDash.Essentials.Core/CrestronIO/IDigitalInput.cs
similarity index 100%
rename from src/PepperDash.Essentials.Core/Crestron IO/IDigitalInput.cs
rename to src/PepperDash.Essentials.Core/CrestronIO/IDigitalInput.cs
diff --git a/src/PepperDash.Essentials.Core/Crestron IO/IDigitalOutput.cs b/src/PepperDash.Essentials.Core/CrestronIO/IDigitalOutput.cs
similarity index 100%
rename from src/PepperDash.Essentials.Core/Crestron IO/IDigitalOutput.cs
rename to src/PepperDash.Essentials.Core/CrestronIO/IDigitalOutput.cs
diff --git a/src/PepperDash.Essentials.Core/Crestron IO/IHasCresnetBranches.cs b/src/PepperDash.Essentials.Core/CrestronIO/IHasCresnetBranches.cs
similarity index 100%
rename from src/PepperDash.Essentials.Core/Crestron IO/IHasCresnetBranches.cs
rename to src/PepperDash.Essentials.Core/CrestronIO/IHasCresnetBranches.cs
diff --git a/src/PepperDash.Essentials.Core/Crestron IO/IOPortConfig.cs b/src/PepperDash.Essentials.Core/CrestronIO/IOPortConfig.cs
similarity index 100%
rename from src/PepperDash.Essentials.Core/Crestron IO/IOPortConfig.cs
rename to src/PepperDash.Essentials.Core/CrestronIO/IOPortConfig.cs
diff --git a/src/PepperDash.Essentials.Core/Crestron IO/ISwitchedOutput.cs b/src/PepperDash.Essentials.Core/CrestronIO/ISwitchedOutput.cs
similarity index 100%
rename from src/PepperDash.Essentials.Core/Crestron IO/ISwitchedOutput.cs
rename to src/PepperDash.Essentials.Core/CrestronIO/ISwitchedOutput.cs