diff --git a/RGB.NET.Core/Exceptions/RGBDeviceException.cs b/RGB.NET.Core/Exceptions/RGBDeviceException.cs
index 626b423..735b0c4 100644
--- a/RGB.NET.Core/Exceptions/RGBDeviceException.cs
+++ b/RGB.NET.Core/Exceptions/RGBDeviceException.cs
@@ -1,6 +1,6 @@
using System;
-namespace RGB.NET.Core.Exceptions
+namespace RGB.NET.Core
{
///
///
@@ -12,7 +12,7 @@ namespace RGB.NET.Core.Exceptions
///
///
- /// Initializes a new instance of the class.
+ /// Initializes a new instance of the class.
///
/// The message which describes the reason of throwing this exception.
/// Optional inner exception, which lead to this exception.
diff --git a/RGB.NET.Core/RGB.NET.Core.csproj.DotSettings b/RGB.NET.Core/RGB.NET.Core.csproj.DotSettings
index 3d48c05..5d92cdb 100644
--- a/RGB.NET.Core/RGB.NET.Core.csproj.DotSettings
+++ b/RGB.NET.Core/RGB.NET.Core.csproj.DotSettings
@@ -5,6 +5,7 @@
True
True
True
+ True
True
True
True
diff --git a/RGB.NET.Devices.Asus/Native/_AsusSDK.cs b/RGB.NET.Devices.Asus/Native/_AsusSDK.cs
index e4e881c..09a3f02 100644
--- a/RGB.NET.Devices.Asus/Native/_AsusSDK.cs
+++ b/RGB.NET.Devices.Asus/Native/_AsusSDK.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
-using RGB.NET.Core.Exceptions;
+using RGB.NET.Core;
namespace RGB.NET.Devices.Asus.Native
{
diff --git a/RGB.NET.Devices.CoolerMaster/Attributes/DeviceTypeAttribute.cs b/RGB.NET.Devices.CoolerMaster/Attributes/DeviceTypeAttribute.cs
index 4367236..768a80f 100644
--- a/RGB.NET.Devices.CoolerMaster/Attributes/DeviceTypeAttribute.cs
+++ b/RGB.NET.Devices.CoolerMaster/Attributes/DeviceTypeAttribute.cs
@@ -1,7 +1,7 @@
using System;
using RGB.NET.Core;
-namespace RGB.NET.Devices.CoolerMaster.Attributes
+namespace RGB.NET.Devices.CoolerMaster
{
///
///
@@ -23,7 +23,7 @@ namespace RGB.NET.Devices.CoolerMaster.Attributes
///
///
- /// Internal constructor of the class.
+ /// Internal constructor of the class.
///
/// The .
public DeviceTypeAttribute(RGBDeviceType deviceType)
diff --git a/RGB.NET.Devices.CoolerMaster/CoolerMasterDeviceProvider.cs b/RGB.NET.Devices.CoolerMaster/CoolerMasterDeviceProvider.cs
index 2a2cc47..6b19228 100644
--- a/RGB.NET.Devices.CoolerMaster/CoolerMasterDeviceProvider.cs
+++ b/RGB.NET.Devices.CoolerMaster/CoolerMasterDeviceProvider.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Globalization;
using RGB.NET.Core;
-using RGB.NET.Core.Exceptions;
using RGB.NET.Devices.CoolerMaster.Helper;
using RGB.NET.Devices.CoolerMaster.Native;
diff --git a/RGB.NET.Devices.CoolerMaster/Enum/CoolerMasterDevicesIndexes.cs b/RGB.NET.Devices.CoolerMaster/Enum/CoolerMasterDevicesIndexes.cs
index 22c1e9c..46a08a9 100644
--- a/RGB.NET.Devices.CoolerMaster/Enum/CoolerMasterDevicesIndexes.cs
+++ b/RGB.NET.Devices.CoolerMaster/Enum/CoolerMasterDevicesIndexes.cs
@@ -3,7 +3,6 @@
using System.ComponentModel;
using RGB.NET.Core;
-using RGB.NET.Devices.CoolerMaster.Attributes;
#pragma warning disable 1591 // Missing XML comment for publicly visible type or member
diff --git a/RGB.NET.Devices.CoolerMaster/Helper/EnumExtension.cs b/RGB.NET.Devices.CoolerMaster/Helper/EnumExtension.cs
index a9616cf..9ebd427 100644
--- a/RGB.NET.Devices.CoolerMaster/Helper/EnumExtension.cs
+++ b/RGB.NET.Devices.CoolerMaster/Helper/EnumExtension.cs
@@ -2,7 +2,6 @@
using System.ComponentModel;
using System.Reflection;
using RGB.NET.Core;
-using RGB.NET.Devices.CoolerMaster.Attributes;
namespace RGB.NET.Devices.CoolerMaster.Helper
{
diff --git a/RGB.NET.Devices.CoolerMaster/Native/_CoolerMasterSDK.cs b/RGB.NET.Devices.CoolerMaster/Native/_CoolerMasterSDK.cs
index cd1b586..f59f0f8 100644
--- a/RGB.NET.Devices.CoolerMaster/Native/_CoolerMasterSDK.cs
+++ b/RGB.NET.Devices.CoolerMaster/Native/_CoolerMasterSDK.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
-using RGB.NET.Core.Exceptions;
+using RGB.NET.Core;
namespace RGB.NET.Devices.CoolerMaster.Native
{
diff --git a/RGB.NET.Devices.CoolerMaster/RGB.NET.Devices.CoolerMaster.csproj.DotSettings b/RGB.NET.Devices.CoolerMaster/RGB.NET.Devices.CoolerMaster.csproj.DotSettings
index 881f12b..44309b1 100644
--- a/RGB.NET.Devices.CoolerMaster/RGB.NET.Devices.CoolerMaster.csproj.DotSettings
+++ b/RGB.NET.Devices.CoolerMaster/RGB.NET.Devices.CoolerMaster.csproj.DotSettings
@@ -1,4 +1,5 @@
+ True
True
True
True
diff --git a/RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs b/RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs
index 0ec423b..e0f7413 100644
--- a/RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs
+++ b/RGB.NET.Devices.Corsair/CorsairDeviceProvider.cs
@@ -6,9 +6,7 @@ using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Runtime.InteropServices;
using RGB.NET.Core;
-using RGB.NET.Core.Exceptions;
using RGB.NET.Devices.Corsair.Native;
-using RGB.NET.Devices.Corsair.SpecialParts;
namespace RGB.NET.Devices.Corsair
{
diff --git a/RGB.NET.Devices.Corsair/Mouse/CorsairMouseRGBDevice.cs b/RGB.NET.Devices.Corsair/Mouse/CorsairMouseRGBDevice.cs
index 94ccbfd..3b5259f 100644
--- a/RGB.NET.Devices.Corsair/Mouse/CorsairMouseRGBDevice.cs
+++ b/RGB.NET.Devices.Corsair/Mouse/CorsairMouseRGBDevice.cs
@@ -3,7 +3,6 @@
using System;
using RGB.NET.Core;
-using RGB.NET.Core.Exceptions;
namespace RGB.NET.Devices.Corsair
{
diff --git a/RGB.NET.Devices.Corsair/Native/_CUESDK.cs b/RGB.NET.Devices.Corsair/Native/_CUESDK.cs
index 0f1e63e..330d33a 100644
--- a/RGB.NET.Devices.Corsair/Native/_CUESDK.cs
+++ b/RGB.NET.Devices.Corsair/Native/_CUESDK.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
-using RGB.NET.Core.Exceptions;
+using RGB.NET.Core;
namespace RGB.NET.Devices.Corsair.Native
{
diff --git a/RGB.NET.Devices.Corsair/RGB.NET.Devices.Corsair.csproj.DotSettings b/RGB.NET.Devices.Corsair/RGB.NET.Devices.Corsair.csproj.DotSettings
index 9d6bbd4..1b3f9b0 100644
--- a/RGB.NET.Devices.Corsair/RGB.NET.Devices.Corsair.csproj.DotSettings
+++ b/RGB.NET.Devices.Corsair/RGB.NET.Devices.Corsair.csproj.DotSettings
@@ -11,4 +11,5 @@
True
True
True
+ True
True
\ No newline at end of file
diff --git a/RGB.NET.Devices.Corsair/SpecialParts/LightbarSpecialPart.cs b/RGB.NET.Devices.Corsair/SpecialParts/LightbarSpecialPart.cs
index 3c1b56b..705bac0 100644
--- a/RGB.NET.Devices.Corsair/SpecialParts/LightbarSpecialPart.cs
+++ b/RGB.NET.Devices.Corsair/SpecialParts/LightbarSpecialPart.cs
@@ -7,7 +7,7 @@ using System.Collections.ObjectModel;
using System.Linq;
using RGB.NET.Core;
-namespace RGB.NET.Devices.Corsair.SpecialParts
+namespace RGB.NET.Devices.Corsair
{
///
///
diff --git a/RGB.NET.Devices.Logitech/Native/_LogitechGSDK.cs b/RGB.NET.Devices.Logitech/Native/_LogitechGSDK.cs
index ce5e678..d3c46f4 100644
--- a/RGB.NET.Devices.Logitech/Native/_LogitechGSDK.cs
+++ b/RGB.NET.Devices.Logitech/Native/_LogitechGSDK.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
-using RGB.NET.Core.Exceptions;
+using RGB.NET.Core;
namespace RGB.NET.Devices.Logitech.Native
{
diff --git a/RGB.NET.Devices.Msi/Native/_MsiSDK.cs b/RGB.NET.Devices.Msi/Native/_MsiSDK.cs
index 8504094..031918d 100644
--- a/RGB.NET.Devices.Msi/Native/_MsiSDK.cs
+++ b/RGB.NET.Devices.Msi/Native/_MsiSDK.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
-using RGB.NET.Core.Exceptions;
+using RGB.NET.Core;
namespace RGB.NET.Devices.Msi.Native
{
diff --git a/RGB.NET.Devices.Razer/Native/_RazerSDK.cs b/RGB.NET.Devices.Razer/Native/_RazerSDK.cs
index af6310b..b2638cb 100644
--- a/RGB.NET.Devices.Razer/Native/_RazerSDK.cs
+++ b/RGB.NET.Devices.Razer/Native/_RazerSDK.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
-using RGB.NET.Core.Exceptions;
+using RGB.NET.Core;
namespace RGB.NET.Devices.Razer.Native
{