diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/DFSReferral/DfsReferralEntry.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/DFSReferral/DfsReferralEntry.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/DFSReferral/DfsReferralEntry.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/DFSReferral/DfsReferralEntry.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/DFSReferral/RequestGetDfsReferral.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/DFSReferral/RequestGetDfsReferral.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/DFSReferral/RequestGetDfsReferral.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/DFSReferral/RequestGetDfsReferral.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/DFSReferral/ResponseGetDfsReferral.cs.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/DFSReferral/ResponseGetDfsReferral.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/DFSReferral/ResponseGetDfsReferral.cs.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/DFSReferral/ResponseGetDfsReferral.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/FindInformation/FindFileBothDirectoryInfo.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/FindInformation/FindFileBothDirectoryInfo.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/FindInformation/FindFileBothDirectoryInfo.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/FindInformation/FindFileBothDirectoryInfo.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/FindInformation/FindFileDirectoryInfo.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/FindInformation/FindFileDirectoryInfo.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/FindInformation/FindFileDirectoryInfo.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/FindInformation/FindFileDirectoryInfo.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/FindInformation/FindFileFullDirectoryInfo.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/FindInformation/FindFileFullDirectoryInfo.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/FindInformation/FindFileFullDirectoryInfo.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/FindInformation/FindFileFullDirectoryInfo.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/FindInformation/FindFileNamesInfo.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/FindInformation/FindFileNamesInfo.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/FindInformation/FindFileNamesInfo.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/FindInformation/FindFileNamesInfo.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/FindInformation/FindInfoQueryEASize.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/FindInformation/FindInfoQueryEASize.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/FindInformation/FindInfoQueryEASize.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/FindInformation/FindInfoQueryEASize.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/FindInformation/FindInfoQueryExtendedAttributesFromList.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/FindInformation/FindInfoQueryExtendedAttributesFromList.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/FindInformation/FindInfoQueryExtendedAttributesFromList.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/FindInformation/FindInfoQueryExtendedAttributesFromList.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/FindInformation/FindInfoStandard.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/FindInformation/FindInfoStandard.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/FindInformation/FindInfoStandard.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/FindInformation/FindInfoStandard.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/FindInformation/FindInformation.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/FindInformation/FindInformation.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/FindInformation/FindInformation.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/FindInformation/FindInformation.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/FindInformation/FindInformationEntry.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/FindInformation/FindInformationEntry.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/FindInformation/FindInformationEntry.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/FindInformation/FindInformationEntry.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/FullExtendedAttribute.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/FullExtendedAttribute.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/FullExtendedAttribute.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/FullExtendedAttribute.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/FullExtendedAttributeList.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/FullExtendedAttributeList.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/FullExtendedAttributeList.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/FullExtendedAttributeList.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryFSInformation/Enums/DeviceCharacteristics.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryFSInformation/Enums/DeviceCharacteristics.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryFSInformation/Enums/DeviceCharacteristics.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryFSInformation/Enums/DeviceCharacteristics.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryFSInformation/Enums/DeviceType.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryFSInformation/Enums/DeviceType.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryFSInformation/Enums/DeviceType.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryFSInformation/Enums/DeviceType.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryFSInformation/Enums/FileSystemAttributes.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryFSInformation/Enums/FileSystemAttributes.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryFSInformation/Enums/FileSystemAttributes.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryFSInformation/Enums/FileSystemAttributes.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryFSInformation/QueryFSAttibuteInfo.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryFSInformation/QueryFSAttibuteInfo.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryFSInformation/QueryFSAttibuteInfo.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryFSInformation/QueryFSAttibuteInfo.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryFSInformation/QueryFSDeviceInfo.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryFSInformation/QueryFSDeviceInfo.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryFSInformation/QueryFSDeviceInfo.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryFSInformation/QueryFSDeviceInfo.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryFSInformation/QueryFSInfoAllocation.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryFSInformation/QueryFSInfoAllocation.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryFSInformation/QueryFSInfoAllocation.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryFSInformation/QueryFSInfoAllocation.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryFSInformation/QueryFSInfoVolume.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryFSInformation/QueryFSInfoVolume.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryFSInformation/QueryFSInfoVolume.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryFSInformation/QueryFSInfoVolume.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryFSInformation/QueryFSInformation.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryFSInformation/QueryFSInformation.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryFSInformation/QueryFSInformation.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryFSInformation/QueryFSInformation.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryFSInformation/QueryFSSizeInfo.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryFSInformation/QueryFSSizeInfo.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryFSInformation/QueryFSSizeInfo.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryFSInformation/QueryFSSizeInfo.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryFSInformation/QueryFSVolumeInfo.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryFSInformation/QueryFSVolumeInfo.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryFSInformation/QueryFSVolumeInfo.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryFSInformation/QueryFSVolumeInfo.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/Enums/CompressionFormat.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/Enums/CompressionFormat.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/Enums/CompressionFormat.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/Enums/CompressionFormat.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryAllExtendedAttributes.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryAllExtendedAttributes.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryAllExtendedAttributes.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryAllExtendedAttributes.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryEASize.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryEASize.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryEASize.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryEASize.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryExtendedAttributesFromList.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryExtendedAttributesFromList.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryExtendedAttributesFromList.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryExtendedAttributesFromList.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryFileAllInfo.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryFileAllInfo.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryFileAllInfo.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryFileAllInfo.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryFileAltNameInfo.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryFileAltNameInfo.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryFileAltNameInfo.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryFileAltNameInfo.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryFileBasicInfo.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryFileBasicInfo.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryFileBasicInfo.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryFileBasicInfo.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryFileCompressionInfo.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryFileCompressionInfo.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryFileCompressionInfo.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryFileCompressionInfo.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryFileExtendedAttributeInfo.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryFileExtendedAttributeInfo.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryFileExtendedAttributeInfo.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryFileExtendedAttributeInfo.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryFileNameInfo.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryFileNameInfo.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryFileNameInfo.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryFileNameInfo.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryFileStandardInfo.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryFileStandardInfo.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryFileStandardInfo.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryFileStandardInfo.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryFileStreamInfo.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryFileStreamInfo.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryFileStreamInfo.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryFileStreamInfo.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryInfoStandard.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryInfoStandard.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryInfoStandard.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryInfoStandard.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryInformation.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryInformation.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/QueryInformation/QueryInformation.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/QueryInformation/QueryInformation.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/SetInformation/SetExtendedAttributes.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/SetInformation/SetExtendedAttributes.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/SetInformation/SetExtendedAttributes.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/SetInformation/SetExtendedAttributes.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/SetInformation/SetFileAllocationInfo.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/SetInformation/SetFileAllocationInfo.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/SetInformation/SetFileAllocationInfo.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/SetInformation/SetFileAllocationInfo.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/SetInformation/SetFileBasicInfo.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/SetInformation/SetFileBasicInfo.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/SetInformation/SetFileBasicInfo.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/SetInformation/SetFileBasicInfo.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/SetInformation/SetFileDispositionInfo.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/SetInformation/SetFileDispositionInfo.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/SetInformation/SetFileDispositionInfo.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/SetInformation/SetFileDispositionInfo.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/SetInformation/SetFileEndOfFileInfo.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/SetInformation/SetFileEndOfFileInfo.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/SetInformation/SetFileEndOfFileInfo.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/SetInformation/SetFileEndOfFileInfo.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/SetInformation/SetInfoStandard.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/SetInformation/SetInfoStandard.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/SetInformation/SetInfoStandard.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/SetInformation/SetInfoStandard.cs
diff --git a/SMBLibrary/SMB1/Transaction2Subcommands/SetInformation/SetInformation.cs b/SMBLibrary/SMB1/Transaction2Subcommands/Structures/SetInformation/SetInformation.cs
similarity index 100%
rename from SMBLibrary/SMB1/Transaction2Subcommands/SetInformation/SetInformation.cs
rename to SMBLibrary/SMB1/Transaction2Subcommands/Structures/SetInformation/SetInformation.cs
diff --git a/SMBLibrary/SMBLibrary.csproj b/SMBLibrary/SMBLibrary.csproj
index eb124c3..ce3772d 100644
--- a/SMBLibrary/SMBLibrary.csproj
+++ b/SMBLibrary/SMBLibrary.csproj
@@ -274,9 +274,6 @@
-
-
-
@@ -289,48 +286,51 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+