diff --git a/NSspi.csproj b/NSspi.csproj
index f23a55a..807e806 100644
--- a/NSspi.csproj
+++ b/NSspi.csproj
@@ -48,10 +48,6 @@
     <Compile Include="Contexts\ClientContext.cs" />
     <Compile Include="Contexts\Context.cs" />
     <Compile Include="Contexts\ContextAttrib.cs" />
-    <Compile Include="Contexts\SecureBuffer.cs" />
-    <Compile Include="Contexts\SecureBufferDataRep.cs" />
-    <Compile Include="Contexts\SecureBufferDesc.cs" />
-    <Compile Include="Contexts\SecureBufferType.cs" />
     <Compile Include="Contexts\ServerContext.cs" />
     <Compile Include="Credentials\ClientCredential.cs" />
     <Compile Include="Credentials\Credential.cs" />
@@ -64,9 +60,16 @@
     <Compile Include="PackageNames.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SecureBuffer\SecureBuffer.cs" />
+    <Compile Include="SecureBuffer\SecureBufferDataRep.cs" />
+    <Compile Include="SecureBuffer\SecureBufferDesc.cs" />
+    <Compile Include="SecureBuffer\SecureBufferType.cs" />
     <Compile Include="SecurityStatus.cs" />
     <Compile Include="SSPIException.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="SecureBuffers\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Contexts/SecureBuffer.cs b/SecureBuffer/SecureBuffer.cs
similarity index 100%
rename from Contexts/SecureBuffer.cs
rename to SecureBuffer/SecureBuffer.cs
diff --git a/Contexts/SecureBufferDataRep.cs b/SecureBuffer/SecureBufferDataRep.cs
similarity index 100%
rename from Contexts/SecureBufferDataRep.cs
rename to SecureBuffer/SecureBufferDataRep.cs
diff --git a/Contexts/SecureBufferDesc.cs b/SecureBuffer/SecureBufferDesc.cs
similarity index 100%
rename from Contexts/SecureBufferDesc.cs
rename to SecureBuffer/SecureBufferDesc.cs
diff --git a/Contexts/SecureBufferType.cs b/SecureBuffer/SecureBufferType.cs
similarity index 100%
rename from Contexts/SecureBufferType.cs
rename to SecureBuffer/SecureBufferType.cs