diff --git a/src/Lithnet.CredentialProvider/Interop/AccountOptions.cs b/src/Lithnet.CredentialProvider/Interop/Enums/AccountOptions.cs
similarity index 100%
rename from src/Lithnet.CredentialProvider/Interop/AccountOptions.cs
rename to src/Lithnet.CredentialProvider/Interop/Enums/AccountOptions.cs
diff --git a/src/Lithnet.CredentialProvider/Interop/FieldType.cs b/src/Lithnet.CredentialProvider/Interop/Enums/FieldType.cs
similarity index 100%
rename from src/Lithnet.CredentialProvider/Interop/FieldType.cs
rename to src/Lithnet.CredentialProvider/Interop/Enums/FieldType.cs
diff --git a/src/Lithnet.CredentialProvider/Interop/KerbLogonSubmitType.cs b/src/Lithnet.CredentialProvider/Interop/Enums/KerbLogonSubmitType.cs
similarity index 100%
rename from src/Lithnet.CredentialProvider/Interop/KerbLogonSubmitType.cs
rename to src/Lithnet.CredentialProvider/Interop/Enums/KerbLogonSubmitType.cs
diff --git a/src/Lithnet.CredentialProvider/Interop/InternalExtensions.cs b/src/Lithnet.CredentialProvider/Interop/InternalExtensions.cs
index cd0f242..b845f46 100644
--- a/src/Lithnet.CredentialProvider/Interop/InternalExtensions.cs
+++ b/src/Lithnet.CredentialProvider/Interop/InternalExtensions.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Security;
-using Lithnet.CredentialProvider.Interop;
 
 namespace Lithnet.CredentialProvider.Interop
 {
diff --git a/src/Lithnet.CredentialProvider/Interop/FieldDescriptor.cs b/src/Lithnet.CredentialProvider/Interop/Structs/FieldDescriptor.cs
similarity index 100%
rename from src/Lithnet.CredentialProvider/Interop/FieldDescriptor.cs
rename to src/Lithnet.CredentialProvider/Interop/Structs/FieldDescriptor.cs
diff --git a/src/Lithnet.CredentialProvider/Interop/InnerPropertyValue.cs b/src/Lithnet.CredentialProvider/Interop/Structs/InnerPropertyValue.cs
similarity index 100%
rename from src/Lithnet.CredentialProvider/Interop/InnerPropertyValue.cs
rename to src/Lithnet.CredentialProvider/Interop/Structs/InnerPropertyValue.cs
diff --git a/src/Lithnet.CredentialProvider/Interop/KerberosInteractiveUnlockLogon.cs b/src/Lithnet.CredentialProvider/Interop/Structs/KerberosInteractiveUnlockLogon.cs
similarity index 100%
rename from src/Lithnet.CredentialProvider/Interop/KerberosInteractiveUnlockLogon.cs
rename to src/Lithnet.CredentialProvider/Interop/Structs/KerberosInteractiveUnlockLogon.cs
diff --git a/src/Lithnet.CredentialProvider/Interop/LargeInteger.cs b/src/Lithnet.CredentialProvider/Interop/Structs/LargeInteger.cs
similarity index 100%
rename from src/Lithnet.CredentialProvider/Interop/LargeInteger.cs
rename to src/Lithnet.CredentialProvider/Interop/Structs/LargeInteger.cs
diff --git a/src/Lithnet.CredentialProvider/Interop/LsaHandle.cs b/src/Lithnet.CredentialProvider/Interop/Structs/LsaHandle.cs
similarity index 100%
rename from src/Lithnet.CredentialProvider/Interop/LsaHandle.cs
rename to src/Lithnet.CredentialProvider/Interop/Structs/LsaHandle.cs
diff --git a/src/Lithnet.CredentialProvider/Interop/LsaString.cs b/src/Lithnet.CredentialProvider/Interop/Structs/LsaString.cs
similarity index 100%
rename from src/Lithnet.CredentialProvider/Interop/LsaString.cs
rename to src/Lithnet.CredentialProvider/Interop/Structs/LsaString.cs
diff --git a/src/Lithnet.CredentialProvider/Interop/LsaStringUni.cs b/src/Lithnet.CredentialProvider/Interop/Structs/LsaStringUni.cs
similarity index 100%
rename from src/Lithnet.CredentialProvider/Interop/LsaStringUni.cs
rename to src/Lithnet.CredentialProvider/Interop/Structs/LsaStringUni.cs
diff --git a/src/Lithnet.CredentialProvider/Interop/PropertyKey.cs b/src/Lithnet.CredentialProvider/Interop/Structs/PropertyKey.cs
similarity index 100%
rename from src/Lithnet.CredentialProvider/Interop/PropertyKey.cs
rename to src/Lithnet.CredentialProvider/Interop/Structs/PropertyKey.cs
diff --git a/src/Lithnet.CredentialProvider/Interop/PropertyValue.cs b/src/Lithnet.CredentialProvider/Interop/Structs/PropertyValue.cs
similarity index 100%
rename from src/Lithnet.CredentialProvider/Interop/PropertyValue.cs
rename to src/Lithnet.CredentialProvider/Interop/Structs/PropertyValue.cs
diff --git a/src/Lithnet.CredentialProvider/Interop/ULargeInteger.cs b/src/Lithnet.CredentialProvider/Interop/Structs/ULargeInteger.cs
similarity index 100%
rename from src/Lithnet.CredentialProvider/Interop/ULargeInteger.cs
rename to src/Lithnet.CredentialProvider/Interop/Structs/ULargeInteger.cs
diff --git a/src/Lithnet.CredentialProvider/Interop/UnmanagedArray.cs b/src/Lithnet.CredentialProvider/Interop/Structs/UnmanagedArray.cs
similarity index 100%
rename from src/Lithnet.CredentialProvider/Interop/UnmanagedArray.cs
rename to src/Lithnet.CredentialProvider/Interop/Structs/UnmanagedArray.cs
diff --git a/src/Lithnet.CredentialProvider/Interop/UnmanagedBlob.cs b/src/Lithnet.CredentialProvider/Interop/Structs/UnmanagedBlob.cs
similarity index 100%
rename from src/Lithnet.CredentialProvider/Interop/UnmanagedBlob.cs
rename to src/Lithnet.CredentialProvider/Interop/Structs/UnmanagedBlob.cs