diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/AudioCodecBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/AudioCodecBase.cs
similarity index 100%
rename from essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/AudioCodecBase.cs
rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/AudioCodecBase.cs
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/DeviceApiBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/DeviceApiBase.cs
similarity index 100%
rename from essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/DeviceApiBase.cs
rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/DeviceApiBase.cs
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/DeviceJsonApi.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/DeviceJsonApi.cs
similarity index 100%
rename from essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/DeviceJsonApi.cs
rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/DeviceJsonApi.cs
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/EssentialsBridgeableDevice.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/EssentialsBridgeableDevice.cs
similarity index 100%
rename from essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/EssentialsBridgeableDevice.cs
rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/EssentialsBridgeableDevice.cs
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/EssentialsDevice.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/EssentialsDevice.cs
similarity index 99%
rename from essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/EssentialsDevice.cs
rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/EssentialsDevice.cs
index 8d7f2c8d..a049cd19 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/EssentialsDevice.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/EssentialsDevice.cs	
@@ -84,7 +84,7 @@ namespace PepperDash.Essentials.Core
             {
                 Debug.Console(2, "Getting Description Attribute from class: '{0}'", typeof(T).FullName);
                 var descriptionAttribute = typeof(T).GetCustomAttributes(typeof(DescriptionAttribute), true) as DescriptionAttribute[];
-                string description = descriptionAttribute[0].Description;
+                string description = descriptionAttribute[0].Description;
                 var snippetAttribute = typeof(T).GetCustomAttributes(typeof(ConfigSnippetAttribute), true) as ConfigSnippetAttribute[];
                 DeviceFactory.AddFactoryForType(typeName.ToLower(), description, typeof(T), BuildDevice);
             }
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/ReconfigurableDevice.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/ReconfigurableDevice.cs
similarity index 100%
rename from essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/ReconfigurableDevice.cs
rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/ReconfigurableDevice.cs
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/SmartObjectBaseTypes.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/SmartObjectBaseTypes.cs
similarity index 100%
rename from essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/SmartObjectBaseTypes.cs
rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/SmartObjectBaseTypes.cs
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/VideoCodecBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/VideoCodecBase.cs
similarity index 100%
rename from essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/VideoCodecBase.cs
rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Base Classes/VideoCodecBase.cs
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/AudioInterfaces.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Interfaces/AudioInterfaces.cs
similarity index 100%
rename from essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/AudioInterfaces.cs
rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Interfaces/AudioInterfaces.cs
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/CodecInterfaces.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Interfaces/CodecInterfaces.cs
similarity index 100%
rename from essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/CodecInterfaces.cs
rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Interfaces/CodecInterfaces.cs
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IAttachVideoStatusExtensions.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Interfaces/IAttachVideoStatusExtensions.cs
similarity index 100%
rename from essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IAttachVideoStatusExtensions.cs
rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Interfaces/IAttachVideoStatusExtensions.cs
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IHasFeedbacks.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Interfaces/IHasFeedbacks.cs
similarity index 100%
rename from essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IHasFeedbacks.cs
rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Interfaces/IHasFeedbacks.cs
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IProjectorInterfaces.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Interfaces/IProjectorInterfaces.cs
similarity index 96%
rename from essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IProjectorInterfaces.cs
rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Interfaces/IProjectorInterfaces.cs
index 6efb7776..c0cb33ed 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IProjectorInterfaces.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Interfaces/IProjectorInterfaces.cs	
@@ -2,21 +2,21 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core
-{
-    public interface IBasicVideoMute
-    {
-        void VideoMuteToggle();
-    }
-
-    public interface IBasicVideoMuteWithFeedback : IBasicVideoMute
-    {
-        BoolFeedback VideoMuteIsOn { get; }
-
-        void VideoMuteOn();
-        void VideoMuteOff();
- 
-    }
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Core
+{
+    public interface IBasicVideoMute
+    {
+        void VideoMuteToggle();
+    }
+
+    public interface IBasicVideoMuteWithFeedback : IBasicVideoMute
+    {
+        BoolFeedback VideoMuteIsOn { get; }
+
+        void VideoMuteOn();
+        void VideoMuteOff();
+ 
+    }
 }
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IUsageTracking.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Interfaces/IUsageTracking.cs
similarity index 100%
rename from essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IUsageTracking.cs
rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Interfaces/IUsageTracking.cs
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IVolumeAndAudioInterfaces.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Interfaces/IVolumeAndAudioInterfaces.cs
similarity index 100%
rename from essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IVolumeAndAudioInterfaces.cs
rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Interfaces/IVolumeAndAudioInterfaces.cs
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/FIND HOMES Interfaces.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Interfaces/Interfaces.cs
similarity index 100%
rename from essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/FIND HOMES Interfaces.cs
rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/Interfaces/Interfaces.cs