diff --git a/NSspi.sln b/NSspi.sln
index 0c252f2..5bb88e8 100644
--- a/NSspi.sln
+++ b/NSspi.sln
@@ -1,24 +1,20 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSspi", "NSspi.csproj", "{4B4CD933-BF62-4F92-B8FA-6771758C5197}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestClient", "TestClient\TestClient.csproj", "{E93FBF1A-5198-44D6-BDF0-880D17F2B81A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProtocol", "TestProtocol\TestProtocol.csproj", "{9BFD94E1-D9FB-44D7-A6E7-8BAC2620E535}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestServer", "TestServer\TestServer.csproj", "{35B8280A-8EB1-4FB5-B448-B4E9F132317F}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NSspi", "NSspi\NSspi.csproj", "{4B4CD933-BF62-4F92-B8FA-6771758C5197}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {4B4CD933-BF62-4F92-B8FA-6771758C5197}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4B4CD933-BF62-4F92-B8FA-6771758C5197}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4B4CD933-BF62-4F92-B8FA-6771758C5197}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4B4CD933-BF62-4F92-B8FA-6771758C5197}.Release|Any CPU.Build.0 = Release|Any CPU
{E93FBF1A-5198-44D6-BDF0-880D17F2B81A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E93FBF1A-5198-44D6-BDF0-880D17F2B81A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E93FBF1A-5198-44D6-BDF0-880D17F2B81A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -31,6 +27,10 @@ Global
{35B8280A-8EB1-4FB5-B448-B4E9F132317F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{35B8280A-8EB1-4FB5-B448-B4E9F132317F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{35B8280A-8EB1-4FB5-B448-B4E9F132317F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4B4CD933-BF62-4F92-B8FA-6771758C5197}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4B4CD933-BF62-4F92-B8FA-6771758C5197}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4B4CD933-BF62-4F92-B8FA-6771758C5197}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4B4CD933-BF62-4F92-B8FA-6771758C5197}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/ByteWriter.cs b/NSspi/ByteWriter.cs
similarity index 100%
rename from ByteWriter.cs
rename to NSspi/ByteWriter.cs
diff --git a/Contexts/ClientContext.cs b/NSspi/Contexts/ClientContext.cs
similarity index 100%
rename from Contexts/ClientContext.cs
rename to NSspi/Contexts/ClientContext.cs
diff --git a/Contexts/Context.cs b/NSspi/Contexts/Context.cs
similarity index 100%
rename from Contexts/Context.cs
rename to NSspi/Contexts/Context.cs
diff --git a/Contexts/ContextAttrib.cs b/NSspi/Contexts/ContextAttrib.cs
similarity index 100%
rename from Contexts/ContextAttrib.cs
rename to NSspi/Contexts/ContextAttrib.cs
diff --git a/Contexts/ContextNativeMethods.cs b/NSspi/Contexts/ContextNativeMethods.cs
similarity index 100%
rename from Contexts/ContextNativeMethods.cs
rename to NSspi/Contexts/ContextNativeMethods.cs
diff --git a/Contexts/ContextQueries.cs b/NSspi/Contexts/ContextQueries.cs
similarity index 100%
rename from Contexts/ContextQueries.cs
rename to NSspi/Contexts/ContextQueries.cs
diff --git a/Contexts/ContextQueryAttrib.cs b/NSspi/Contexts/ContextQueryAttrib.cs
similarity index 100%
rename from Contexts/ContextQueryAttrib.cs
rename to NSspi/Contexts/ContextQueryAttrib.cs
diff --git a/Contexts/ImpersonationHandle.cs b/NSspi/Contexts/ImpersonationHandle.cs
similarity index 100%
rename from Contexts/ImpersonationHandle.cs
rename to NSspi/Contexts/ImpersonationHandle.cs
diff --git a/Contexts/SafeContextHandle.cs b/NSspi/Contexts/SafeContextHandle.cs
similarity index 100%
rename from Contexts/SafeContextHandle.cs
rename to NSspi/Contexts/SafeContextHandle.cs
diff --git a/Contexts/ServerContext.cs b/NSspi/Contexts/ServerContext.cs
similarity index 100%
rename from Contexts/ServerContext.cs
rename to NSspi/Contexts/ServerContext.cs
diff --git a/Credentials/ClientCredential.cs b/NSspi/Credentials/ClientCredential.cs
similarity index 100%
rename from Credentials/ClientCredential.cs
rename to NSspi/Credentials/ClientCredential.cs
diff --git a/Credentials/Credential.cs b/NSspi/Credentials/Credential.cs
similarity index 100%
rename from Credentials/Credential.cs
rename to NSspi/Credentials/Credential.cs
diff --git a/Credentials/CredentialNativeMethods.cs b/NSspi/Credentials/CredentialNativeMethods.cs
similarity index 100%
rename from Credentials/CredentialNativeMethods.cs
rename to NSspi/Credentials/CredentialNativeMethods.cs
diff --git a/Credentials/CredentialPackage.cs b/NSspi/Credentials/CredentialPackage.cs
similarity index 100%
rename from Credentials/CredentialPackage.cs
rename to NSspi/Credentials/CredentialPackage.cs
diff --git a/Credentials/CredentialQueryAttrib.cs b/NSspi/Credentials/CredentialQueryAttrib.cs
similarity index 100%
rename from Credentials/CredentialQueryAttrib.cs
rename to NSspi/Credentials/CredentialQueryAttrib.cs
diff --git a/Credentials/CredentialType.cs b/NSspi/Credentials/CredentialType.cs
similarity index 100%
rename from Credentials/CredentialType.cs
rename to NSspi/Credentials/CredentialType.cs
diff --git a/Credentials/CredentialUse.cs b/NSspi/Credentials/CredentialUse.cs
similarity index 100%
rename from Credentials/CredentialUse.cs
rename to NSspi/Credentials/CredentialUse.cs
diff --git a/Credentials/QueryNameSupport.cs b/NSspi/Credentials/QueryNameSupport.cs
similarity index 100%
rename from Credentials/QueryNameSupport.cs
rename to NSspi/Credentials/QueryNameSupport.cs
diff --git a/Credentials/SafeCredentialHandle.cs b/NSspi/Credentials/SafeCredentialHandle.cs
similarity index 100%
rename from Credentials/SafeCredentialHandle.cs
rename to NSspi/Credentials/SafeCredentialHandle.cs
diff --git a/Credentials/ServerCredential.cs b/NSspi/Credentials/ServerCredential.cs
similarity index 100%
rename from Credentials/ServerCredential.cs
rename to NSspi/Credentials/ServerCredential.cs
diff --git a/NSspi.csproj b/NSspi/NSspi.csproj
similarity index 100%
rename from NSspi.csproj
rename to NSspi/NSspi.csproj
diff --git a/NativeMethods.cs b/NSspi/NativeMethods.cs
similarity index 100%
rename from NativeMethods.cs
rename to NSspi/NativeMethods.cs
diff --git a/PackageNames.cs b/NSspi/PackageNames.cs
similarity index 100%
rename from PackageNames.cs
rename to NSspi/PackageNames.cs
diff --git a/PackageSupport.cs b/NSspi/PackageSupport.cs
similarity index 100%
rename from PackageSupport.cs
rename to NSspi/PackageSupport.cs
diff --git a/Program.cs b/NSspi/Program.cs
similarity index 100%
rename from Program.cs
rename to NSspi/Program.cs
diff --git a/Properties/AssemblyInfo.cs b/NSspi/Properties/AssemblyInfo.cs
similarity index 100%
rename from Properties/AssemblyInfo.cs
rename to NSspi/Properties/AssemblyInfo.cs
diff --git a/SSPIException.cs b/NSspi/SSPIException.cs
similarity index 100%
rename from SSPIException.cs
rename to NSspi/SSPIException.cs
diff --git a/SecPkgInfo.cs b/NSspi/SecPkgInfo.cs
similarity index 100%
rename from SecPkgInfo.cs
rename to NSspi/SecPkgInfo.cs
diff --git a/SecureBuffer/SecureBuffer.cs b/NSspi/SecureBuffer/SecureBuffer.cs
similarity index 100%
rename from SecureBuffer/SecureBuffer.cs
rename to NSspi/SecureBuffer/SecureBuffer.cs
diff --git a/SecureBuffer/SecureBufferAdapter.cs b/NSspi/SecureBuffer/SecureBufferAdapter.cs
similarity index 100%
rename from SecureBuffer/SecureBufferAdapter.cs
rename to NSspi/SecureBuffer/SecureBufferAdapter.cs
diff --git a/SecureBuffer/SecureBufferDataRep.cs b/NSspi/SecureBuffer/SecureBufferDataRep.cs
similarity index 100%
rename from SecureBuffer/SecureBufferDataRep.cs
rename to NSspi/SecureBuffer/SecureBufferDataRep.cs
diff --git a/SecureBuffer/SecureBufferDesc.cs b/NSspi/SecureBuffer/SecureBufferDesc.cs
similarity index 100%
rename from SecureBuffer/SecureBufferDesc.cs
rename to NSspi/SecureBuffer/SecureBufferDesc.cs
diff --git a/SecureBuffer/SecureBufferType.cs b/NSspi/SecureBuffer/SecureBufferType.cs
similarity index 100%
rename from SecureBuffer/SecureBufferType.cs
rename to NSspi/SecureBuffer/SecureBufferType.cs
diff --git a/SecurityStatus.cs b/NSspi/SecurityStatus.cs
similarity index 100%
rename from SecurityStatus.cs
rename to NSspi/SecurityStatus.cs
diff --git a/SspiHandle.cs b/NSspi/SspiHandle.cs
similarity index 100%
rename from SspiHandle.cs
rename to NSspi/SspiHandle.cs
diff --git a/app.config b/NSspi/app.config
similarity index 100%
rename from app.config
rename to NSspi/app.config
diff --git a/TestClient/TestClient.csproj b/TestClient/TestClient.csproj
index 3c69eaf..0c7dc66 100644
--- a/TestClient/TestClient.csproj
+++ b/TestClient/TestClient.csproj
@@ -80,7 +80,7 @@
-
+
{4b4cd933-bf62-4f92-b8fa-6771758c5197}
NSspi
diff --git a/TestProtocol/TestProtocol.csproj b/TestProtocol/TestProtocol.csproj
index 15c2491..c097f17 100644
--- a/TestProtocol/TestProtocol.csproj
+++ b/TestProtocol/TestProtocol.csproj
@@ -75,7 +75,7 @@
-
+
{4b4cd933-bf62-4f92-b8fa-6771758c5197}
NSspi
diff --git a/TestServer/TestServer.csproj b/TestServer/TestServer.csproj
index bd1ba83..3183177 100644
--- a/TestServer/TestServer.csproj
+++ b/TestServer/TestServer.csproj
@@ -78,7 +78,7 @@
-
+
{4b4cd933-bf62-4f92-b8fa-6771758c5197}
NSspi