diff --git a/SMBLibrary/SMB2/Structures/EncryptionCapabilities.cs b/SMBLibrary/SMB2/Structures/NegotiateContext/EncryptionCapabilities.cs
similarity index 100%
rename from SMBLibrary/SMB2/Structures/EncryptionCapabilities.cs
rename to SMBLibrary/SMB2/Structures/NegotiateContext/EncryptionCapabilities.cs
diff --git a/SMBLibrary/SMB2/Structures/NegotiateContext.cs b/SMBLibrary/SMB2/Structures/NegotiateContext/NegotiateContext.cs
similarity index 100%
rename from SMBLibrary/SMB2/Structures/NegotiateContext.cs
rename to SMBLibrary/SMB2/Structures/NegotiateContext/NegotiateContext.cs
diff --git a/SMBLibrary/SMB2/Structures/PreAuthIntegrityCapabilities.cs b/SMBLibrary/SMB2/Structures/NegotiateContext/PreAuthIntegrityCapabilities.cs
similarity index 100%
rename from SMBLibrary/SMB2/Structures/PreAuthIntegrityCapabilities.cs
rename to SMBLibrary/SMB2/Structures/NegotiateContext/PreAuthIntegrityCapabilities.cs