diff --git a/Contexts/ClientContext.cs b/Contexts/ClientContext.cs
index 31b3ff9..ee08102 100644
--- a/Contexts/ClientContext.cs
+++ b/Contexts/ClientContext.cs
@@ -4,6 +4,8 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
+using NSspi.Buffers;
+using NSspi.Credentials;
 
 namespace NSspi.Contexts
 {
diff --git a/Contexts/Context.cs b/Contexts/Context.cs
index 244efff..eb0e3eb 100644
--- a/Contexts/Context.cs
+++ b/Contexts/Context.cs
@@ -1,13 +1,15 @@
-using NSspi.Contexts;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
-using System.Runtime.InteropServices;
-using System.Runtime.CompilerServices;
+using NSspi.Buffers;
+using NSspi.Contexts;
+using NSspi.Credentials;
 
-namespace NSspi
+namespace NSspi.Contexts
 {
     public class Context : IDisposable
     {
diff --git a/Contexts/ContextNativeMethods.cs b/Contexts/ContextNativeMethods.cs
index 15a5eb7..6ddcf6c 100644
--- a/Contexts/ContextNativeMethods.cs
+++ b/Contexts/ContextNativeMethods.cs
@@ -6,9 +6,10 @@ using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
+using NSspi.Buffers;
 using NSspi.Contexts;
 
-namespace NSspi
+namespace NSspi.Contexts
 {
     internal static class ContextNativeMethods
     {
diff --git a/Contexts/ServerContext.cs b/Contexts/ServerContext.cs
index 2b82e02..01965c6 100644
--- a/Contexts/ServerContext.cs
+++ b/Contexts/ServerContext.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using NSspi.Buffers;
+using NSspi.Credentials;
 
 namespace NSspi.Contexts
 {
diff --git a/Credentials/ClientCredential.cs b/Credentials/ClientCredential.cs
index 8af928a..8c738e4 100644
--- a/Credentials/ClientCredential.cs
+++ b/Credentials/ClientCredential.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace NSspi
+namespace NSspi.Credentials
 {
     public class ClientCredential : Credential
     {
diff --git a/Credentials/Credential.cs b/Credentials/Credential.cs
index 2edb597..505ffab 100644
--- a/Credentials/Credential.cs
+++ b/Credentials/Credential.cs
@@ -8,8 +8,9 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 using NSspi.Credentials;
+using NSspi.Credentials.Credentials;
 
-namespace NSspi
+namespace NSspi.Credentials
 {
     public class Credential : IDisposable
     {
@@ -40,11 +41,11 @@ namespace NSspi
             {
                 packageName = PackageNames.Kerberos;
             }
-            else if ( package == NSspi.SecurityPackage.Negotiate )
+            else if ( package == SecurityPackage.Negotiate )
             {
                 packageName = PackageNames.Negotiate;
             }
-            else if ( package == NSspi.SecurityPackage.NTLM )
+            else if ( package == SecurityPackage.NTLM )
             {
                 packageName = PackageNames.Ntlm;
             }
diff --git a/Credentials/CredentialNativeMethods.cs b/Credentials/CredentialNativeMethods.cs
index 154f5a3..7305e46 100644
--- a/Credentials/CredentialNativeMethods.cs
+++ b/Credentials/CredentialNativeMethods.cs
@@ -6,8 +6,9 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 using NSspi.Credentials;
+using NSspi.Credentials.Credentials;
 
-namespace NSspi
+namespace NSspi.Credentials
 {
     internal static class CredentialNativeMethods
     {
diff --git a/Credentials/CredentialPackage.cs b/Credentials/CredentialPackage.cs
index a309d7a..1221bb8 100644
--- a/Credentials/CredentialPackage.cs
+++ b/Credentials/CredentialPackage.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace NSspi
+namespace NSspi.Credentials
 {
     public enum SecurityPackage
     {
diff --git a/Credentials/CredentialQueryAttrib.cs b/Credentials/CredentialQueryAttrib.cs
index 7f5bd86..54e9da3 100644
--- a/Credentials/CredentialQueryAttrib.cs
+++ b/Credentials/CredentialQueryAttrib.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace NSspi
+namespace NSspi.Credentials
 {
     /*
      #define SECPKG_CRED_ATTR_NAMES        1
diff --git a/Credentials/CredentialType.cs b/Credentials/CredentialType.cs
index e4961e2..edda0dd 100644
--- a/Credentials/CredentialType.cs
+++ b/Credentials/CredentialType.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace NSspi
+namespace NSspi.Credentials
 {
     public enum CredentialType
     {
diff --git a/Credentials/CredentialUse.cs b/Credentials/CredentialUse.cs
index 103ae2e..aae9b27 100644
--- a/Credentials/CredentialUse.cs
+++ b/Credentials/CredentialUse.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace NSspi
+namespace NSspi.Credentials
 {
     public enum CredentialUse : uint
     {
diff --git a/Credentials/QueryNameSupport.cs b/Credentials/QueryNameSupport.cs
index 3744cca..e762cc4 100644
--- a/Credentials/QueryNameSupport.cs
+++ b/Credentials/QueryNameSupport.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace NSspi.Credentials
+namespace NSspi.Credentials.Credentials
 {
     [StructLayout( LayoutKind.Sequential )]
     public struct QueryNameAttribCarrier
diff --git a/Credentials/ServerCredential.cs b/Credentials/ServerCredential.cs
index 658a0b9..e909b73 100644
--- a/Credentials/ServerCredential.cs
+++ b/Credentials/ServerCredential.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace NSspi
+namespace NSspi.Credentials
 {
     public class ServerCredential : Credential
     {
diff --git a/NativeMethods.cs b/NativeMethods.cs
index 091691c..33d607b 100644
--- a/NativeMethods.cs
+++ b/NativeMethods.cs
@@ -1,11 +1,11 @@
-using NSspi.Contexts;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
-using System.Runtime.ConstrainedExecution;
+using NSspi.Contexts;
 
 namespace NSspi
 {
diff --git a/Program.cs b/Program.cs
index e27acf4..e13734c 100644
--- a/Program.cs
+++ b/Program.cs
@@ -1,5 +1,4 @@
-using NSspi.Contexts;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -8,6 +7,8 @@ using System.Security.Principal;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Serialization;
+using NSspi.Contexts;
+using NSspi.Credentials;
 
 namespace NSspi
 {
diff --git a/SecureBuffer/SecureBuffer.cs b/SecureBuffer/SecureBuffer.cs
index b000ec5..21e4189 100644
--- a/SecureBuffer/SecureBuffer.cs
+++ b/SecureBuffer/SecureBuffer.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace NSspi.Contexts
+namespace NSspi.Buffers
 {
     [StructLayout( LayoutKind.Sequential )]
     public struct SecureBufferInternal
diff --git a/SecureBuffer/SecureBufferAdapter.cs b/SecureBuffer/SecureBufferAdapter.cs
index e4ecb48..c417211 100644
--- a/SecureBuffer/SecureBufferAdapter.cs
+++ b/SecureBuffer/SecureBufferAdapter.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace NSspi.Contexts
+namespace NSspi.Buffers
 {
     public class SecureBufferAdapter : IDisposable
     {
diff --git a/SecureBuffer/SecureBufferDataRep.cs b/SecureBuffer/SecureBufferDataRep.cs
index 734fd26..af20ceb 100644
--- a/SecureBuffer/SecureBufferDataRep.cs
+++ b/SecureBuffer/SecureBufferDataRep.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace NSspi.Contexts
+namespace NSspi.Buffers
 {
     public enum SecureBufferDataRep : int
     {
diff --git a/SecureBuffer/SecureBufferDesc.cs b/SecureBuffer/SecureBufferDesc.cs
index 0fac74f..8fa2bda 100644
--- a/SecureBuffer/SecureBufferDesc.cs
+++ b/SecureBuffer/SecureBufferDesc.cs
@@ -6,7 +6,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace NSspi.Contexts
+namespace NSspi.Buffers
 {
     [StructLayout( LayoutKind.Sequential)]
     public struct SecureBufferDescInternal
diff --git a/SecureBuffer/SecureBufferType.cs b/SecureBuffer/SecureBufferType.cs
index fdab381..fb8208e 100644
--- a/SecureBuffer/SecureBufferType.cs
+++ b/SecureBuffer/SecureBufferType.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace NSspi.Contexts
+namespace NSspi.Buffers
 {
     public enum BufferType : int
     {