diff --git a/SMBLibrary/Authentication/GSSAPI/GSSAPIHelper.cs b/SMBLibrary/Authentication/GSSAPI/GSSAPIHelper.cs
index 86c9c2e..ff4d03e 100644
--- a/SMBLibrary/Authentication/GSSAPI/GSSAPIHelper.cs
+++ b/SMBLibrary/Authentication/GSSAPI/GSSAPIHelper.cs
@@ -8,7 +8,7 @@ using System;
 using System.Collections.Generic;
 using Utilities;
 
-namespace SMBLibrary.Authentication
+namespace SMBLibrary.Authentication.GSSAPI
 {
     public class GSSAPIHelper
     {
diff --git a/SMBLibrary/Authentication/GSSAPI/SPNEGO/DerEncodingHelper.cs b/SMBLibrary/Authentication/GSSAPI/SPNEGO/DerEncodingHelper.cs
index dff8d06..c1d92db 100644
--- a/SMBLibrary/Authentication/GSSAPI/SPNEGO/DerEncodingHelper.cs
+++ b/SMBLibrary/Authentication/GSSAPI/SPNEGO/DerEncodingHelper.cs
@@ -8,7 +8,7 @@ using System;
 using System.Collections.Generic;
 using Utilities;
 
-namespace SMBLibrary.Authentication
+namespace SMBLibrary.Authentication.GSSAPI
 {
     public enum DerEncodingTag : byte
     {
diff --git a/SMBLibrary/Authentication/GSSAPI/SPNEGO/SimpleProtectedNegotiationToken.cs b/SMBLibrary/Authentication/GSSAPI/SPNEGO/SimpleProtectedNegotiationToken.cs
index 50eb2ad..c4328c3 100644
--- a/SMBLibrary/Authentication/GSSAPI/SPNEGO/SimpleProtectedNegotiationToken.cs
+++ b/SMBLibrary/Authentication/GSSAPI/SPNEGO/SimpleProtectedNegotiationToken.cs
@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.Text;
 using Utilities;
 
-namespace SMBLibrary.Authentication
+namespace SMBLibrary.Authentication.GSSAPI
 {
     public abstract class SimpleProtectedNegotiationToken
     {
diff --git a/SMBLibrary/Authentication/GSSAPI/SPNEGO/SimpleProtectedNegotiationTokenInit.cs b/SMBLibrary/Authentication/GSSAPI/SPNEGO/SimpleProtectedNegotiationTokenInit.cs
index 4082fa2..0c3a855 100644
--- a/SMBLibrary/Authentication/GSSAPI/SPNEGO/SimpleProtectedNegotiationTokenInit.cs
+++ b/SMBLibrary/Authentication/GSSAPI/SPNEGO/SimpleProtectedNegotiationTokenInit.cs
@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.IO;
 using Utilities;
 
-namespace SMBLibrary.Authentication
+namespace SMBLibrary.Authentication.GSSAPI
 {
     /// <summary>
     /// RFC 4178 - negTokenInit
diff --git a/SMBLibrary/Authentication/GSSAPI/SPNEGO/SimpleProtectedNegotiationTokenResponse.cs b/SMBLibrary/Authentication/GSSAPI/SPNEGO/SimpleProtectedNegotiationTokenResponse.cs
index ca94657..66906fe 100644
--- a/SMBLibrary/Authentication/GSSAPI/SPNEGO/SimpleProtectedNegotiationTokenResponse.cs
+++ b/SMBLibrary/Authentication/GSSAPI/SPNEGO/SimpleProtectedNegotiationTokenResponse.cs
@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.IO;
 using Utilities;
 
-namespace SMBLibrary.Authentication
+namespace SMBLibrary.Authentication.GSSAPI
 {
     public enum NegState : byte
     {
diff --git a/SMBLibrary/Server/SMB1/SessionSetupHelper.cs b/SMBLibrary/Server/SMB1/SessionSetupHelper.cs
index c0f933d..f0bd480 100644
--- a/SMBLibrary/Server/SMB1/SessionSetupHelper.cs
+++ b/SMBLibrary/Server/SMB1/SessionSetupHelper.cs
@@ -7,7 +7,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using SMBLibrary.Authentication;
+using SMBLibrary.Authentication.GSSAPI;
 using SMBLibrary.Authentication.NTLM;
 using SMBLibrary.SMB1;
 using Utilities;
diff --git a/SMBLibrary/Server/SMB2/NegotiateHelper.cs b/SMBLibrary/Server/SMB2/NegotiateHelper.cs
index a091e21..33d6b8e 100644
--- a/SMBLibrary/Server/SMB2/NegotiateHelper.cs
+++ b/SMBLibrary/Server/SMB2/NegotiateHelper.cs
@@ -6,7 +6,7 @@
  */
 using System;
 using System.Collections.Generic;
-using SMBLibrary.Authentication;
+using SMBLibrary.Authentication.GSSAPI;
 using SMBLibrary.SMB2;
 using Utilities;
 
diff --git a/SMBLibrary/Server/SMB2/SessionSetupHelper.cs b/SMBLibrary/Server/SMB2/SessionSetupHelper.cs
index 1c84e41..0140f1c 100644
--- a/SMBLibrary/Server/SMB2/SessionSetupHelper.cs
+++ b/SMBLibrary/Server/SMB2/SessionSetupHelper.cs
@@ -6,7 +6,7 @@
  */
 using System;
 using System.Collections.Generic;
-using SMBLibrary.Authentication;
+using SMBLibrary.Authentication.GSSAPI;
 using SMBLibrary.Authentication.NTLM;
 using SMBLibrary.SMB2;
 using Utilities;