Now with consistent namespaces and using statement sorting.

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
 {

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
     {

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
     {

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
 {

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
     {

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;
             }

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
     {

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
     {

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

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
     {

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
     {

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

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
     {

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
 {

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
 {

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

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
     {

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
     {

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

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
     {