diff --git a/ClientCredential.cs b/Credentials/ClientCredential.cs
similarity index 100%
rename from ClientCredential.cs
rename to Credentials/ClientCredential.cs
diff --git a/Credential.cs b/Credentials/Credential.cs
similarity index 100%
rename from Credential.cs
rename to Credentials/Credential.cs
diff --git a/CredentialPackage.cs b/Credentials/CredentialPackage.cs
similarity index 100%
rename from CredentialPackage.cs
rename to Credentials/CredentialPackage.cs
diff --git a/CredentialQueryAttrib.cs b/Credentials/CredentialQueryAttrib.cs
similarity index 100%
rename from CredentialQueryAttrib.cs
rename to Credentials/CredentialQueryAttrib.cs
diff --git a/CredentialType.cs b/Credentials/CredentialType.cs
similarity index 100%
rename from CredentialType.cs
rename to Credentials/CredentialType.cs
diff --git a/CredentialUse.cs b/Credentials/CredentialUse.cs
similarity index 100%
rename from CredentialUse.cs
rename to Credentials/CredentialUse.cs
diff --git a/ServerCredential.cs b/Credentials/ServerCredential.cs
similarity index 100%
rename from ServerCredential.cs
rename to Credentials/ServerCredential.cs
diff --git a/NSspi.csproj b/NSspi.csproj
index 85b61b8..64b7366 100644
--- a/NSspi.csproj
+++ b/NSspi.csproj
@@ -44,18 +44,18 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ClientCredential.cs" />
-    <Compile Include="Credential.cs" />
-    <Compile Include="CredentialPackage.cs" />
-    <Compile Include="CredentialQueryAttrib.cs" />
-    <Compile Include="CredentialType.cs" />
-    <Compile Include="CredentialUse.cs" />
+    <Compile Include="Credentials\ClientCredential.cs" />
+    <Compile Include="Credentials\Credential.cs" />
+    <Compile Include="Credentials\CredentialPackage.cs" />
+    <Compile Include="Credentials\CredentialQueryAttrib.cs" />
+    <Compile Include="Credentials\CredentialType.cs" />
+    <Compile Include="Credentials\CredentialUse.cs" />
+    <Compile Include="Credentials\ServerCredential.cs" />
     <Compile Include="NativeMethods.cs" />
     <Compile Include="PackageNames.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SecurityStatus.cs" />
-    <Compile Include="ServerCredential.cs" />
     <Compile Include="SSPIException.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />