diff --git a/Build/MQTTnet.nuspec b/Build/MQTTnet.nuspec
index bb82dd2..07ee736 100644
--- a/Build/MQTTnet.nuspec
+++ b/Build/MQTTnet.nuspec
@@ -14,6 +14,8 @@
 * [Client] Added new MQTTv5 features to options builder.
 * [Client] Added uniform API across all supported MQTT versions (BREAKING CHANGE!)
 * [Server] Added support for MQTTv5 clients. The server will still return _success_ for all cases at the moment even if more granular codes are available.
+
+* [Note] Due to MQTTv5 a lot of new classes were introduced. This required adding new namespaces as well. Most classes are backward compatible but new namespaces must be added.
     </releaseNotes>
     <copyright>Copyright Christian Kratky 2016-2018</copyright>
     <tags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin</tags> 
diff --git a/Source/MQTTnet/Client/MqttClientOptionsBuilderWebSocketParameters.cs b/Source/MQTTnet/Client/Options/MqttClientOptionsBuilderWebSocketParameters.cs
similarity index 89%
rename from Source/MQTTnet/Client/MqttClientOptionsBuilderWebSocketParameters.cs
rename to Source/MQTTnet/Client/Options/MqttClientOptionsBuilderWebSocketParameters.cs
index 54e048b..f516e83 100644
--- a/Source/MQTTnet/Client/MqttClientOptionsBuilderWebSocketParameters.cs
+++ b/Source/MQTTnet/Client/Options/MqttClientOptionsBuilderWebSocketParameters.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Net;
 
-namespace MQTTnet.Client
+namespace MQTTnet.Client.Options
 {
     public class MqttClientOptionsBuilderWebSocketParameters
     {