diff --git a/SMBLibrary/Enums/FileInformation/CompressionFormat.cs b/SMBLibrary/NTFileStore/Enums/FileInformation/CompressionFormat.cs
similarity index 100%
rename from SMBLibrary/Enums/FileInformation/CompressionFormat.cs
rename to SMBLibrary/NTFileStore/Enums/FileInformation/CompressionFormat.cs
diff --git a/SMBLibrary/Enums/FileInformation/FileAttributes.cs b/SMBLibrary/NTFileStore/Enums/FileInformation/FileAttributes.cs
similarity index 100%
rename from SMBLibrary/Enums/FileInformation/FileAttributes.cs
rename to SMBLibrary/NTFileStore/Enums/FileInformation/FileAttributes.cs
diff --git a/SMBLibrary/Enums/FileInformation/FileInformationClass.cs b/SMBLibrary/NTFileStore/Enums/FileInformation/FileInformationClass.cs
similarity index 100%
rename from SMBLibrary/Enums/FileInformation/FileInformationClass.cs
rename to SMBLibrary/NTFileStore/Enums/FileInformation/FileInformationClass.cs
diff --git a/SMBLibrary/Enums/FileSystemInformation/DeviceCharacteristics.cs b/SMBLibrary/NTFileStore/Enums/FileSystemInformation/DeviceCharacteristics.cs
similarity index 100%
rename from SMBLibrary/Enums/FileSystemInformation/DeviceCharacteristics.cs
rename to SMBLibrary/NTFileStore/Enums/FileSystemInformation/DeviceCharacteristics.cs
diff --git a/SMBLibrary/Enums/FileSystemInformation/DeviceType.cs b/SMBLibrary/NTFileStore/Enums/FileSystemInformation/DeviceType.cs
similarity index 100%
rename from SMBLibrary/Enums/FileSystemInformation/DeviceType.cs
rename to SMBLibrary/NTFileStore/Enums/FileSystemInformation/DeviceType.cs
diff --git a/SMBLibrary/Enums/FileSystemInformation/FileSystemAttributes.cs b/SMBLibrary/NTFileStore/Enums/FileSystemInformation/FileSystemAttributes.cs
similarity index 100%
rename from SMBLibrary/Enums/FileSystemInformation/FileSystemAttributes.cs
rename to SMBLibrary/NTFileStore/Enums/FileSystemInformation/FileSystemAttributes.cs
diff --git a/SMBLibrary/Enums/FileSystemInformation/FileSystemControlFlags.cs b/SMBLibrary/NTFileStore/Enums/FileSystemInformation/FileSystemControlFlags.cs
similarity index 100%
rename from SMBLibrary/Enums/FileSystemInformation/FileSystemControlFlags.cs
rename to SMBLibrary/NTFileStore/Enums/FileSystemInformation/FileSystemControlFlags.cs
diff --git a/SMBLibrary/Enums/FileSystemInformation/FileSystemInformationClass.cs b/SMBLibrary/NTFileStore/Enums/FileSystemInformation/FileSystemInformationClass.cs
similarity index 100%
rename from SMBLibrary/Enums/FileSystemInformation/FileSystemInformationClass.cs
rename to SMBLibrary/NTFileStore/Enums/FileSystemInformation/FileSystemInformationClass.cs
diff --git a/SMBLibrary/Enums/FileSystemInformation/SectorSizeInformationFlags.cs b/SMBLibrary/NTFileStore/Enums/FileSystemInformation/SectorSizeInformationFlags.cs
similarity index 100%
rename from SMBLibrary/Enums/FileSystemInformation/SectorSizeInformationFlags.cs
rename to SMBLibrary/NTFileStore/Enums/FileSystemInformation/SectorSizeInformationFlags.cs
diff --git a/SMBLibrary/Enums/NtCreateFile/CreateDisposition.cs b/SMBLibrary/NTFileStore/Enums/NtCreateFile/CreateDisposition.cs
similarity index 100%
rename from SMBLibrary/Enums/NtCreateFile/CreateDisposition.cs
rename to SMBLibrary/NTFileStore/Enums/NtCreateFile/CreateDisposition.cs
diff --git a/SMBLibrary/Enums/NtCreateFile/CreateOptions.cs b/SMBLibrary/NTFileStore/Enums/NtCreateFile/CreateOptions.cs
similarity index 100%
rename from SMBLibrary/Enums/NtCreateFile/CreateOptions.cs
rename to SMBLibrary/NTFileStore/Enums/NtCreateFile/CreateOptions.cs
diff --git a/SMBLibrary/Enums/NtCreateFile/ShareAccess.cs b/SMBLibrary/NTFileStore/Enums/NtCreateFile/ShareAccess.cs
similarity index 100%
rename from SMBLibrary/Enums/NtCreateFile/ShareAccess.cs
rename to SMBLibrary/NTFileStore/Enums/NtCreateFile/ShareAccess.cs
diff --git a/SMBLibrary/Structures/ACE/ACE.cs b/SMBLibrary/NTFileStore/Structures/ACE/ACE.cs
similarity index 100%
rename from SMBLibrary/Structures/ACE/ACE.cs
rename to SMBLibrary/NTFileStore/Structures/ACE/ACE.cs
diff --git a/SMBLibrary/Structures/ACE/AccessAllowedACE.cs b/SMBLibrary/NTFileStore/Structures/ACE/AccessAllowedACE.cs
similarity index 100%
rename from SMBLibrary/Structures/ACE/AccessAllowedACE.cs
rename to SMBLibrary/NTFileStore/Structures/ACE/AccessAllowedACE.cs
diff --git a/SMBLibrary/Structures/ACE/AceHeader.cs b/SMBLibrary/NTFileStore/Structures/ACE/AceHeader.cs
similarity index 100%
rename from SMBLibrary/Structures/ACE/AceHeader.cs
rename to SMBLibrary/NTFileStore/Structures/ACE/AceHeader.cs
diff --git a/SMBLibrary/Structures/ACE/Enums/AceFlags.cs b/SMBLibrary/NTFileStore/Structures/ACE/Enums/AceFlags.cs
similarity index 100%
rename from SMBLibrary/Structures/ACE/Enums/AceFlags.cs
rename to SMBLibrary/NTFileStore/Structures/ACE/Enums/AceFlags.cs
diff --git a/SMBLibrary/Structures/ACE/Enums/AceType.cs b/SMBLibrary/NTFileStore/Structures/ACE/Enums/AceType.cs
similarity index 100%
rename from SMBLibrary/Structures/ACE/Enums/AceType.cs
rename to SMBLibrary/NTFileStore/Structures/ACE/Enums/AceType.cs
diff --git a/SMBLibrary/Structures/ACL.cs b/SMBLibrary/NTFileStore/Structures/ACL.cs
similarity index 100%
rename from SMBLibrary/Structures/ACL.cs
rename to SMBLibrary/NTFileStore/Structures/ACL.cs
diff --git a/SMBLibrary/Structures/FileInformation/FileInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/FileInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/FileInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/FileInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/Query/FileAccessInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileAccessInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/Query/FileAccessInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileAccessInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/Query/FileAlignmentInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileAlignmentInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/Query/FileAlignmentInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileAlignmentInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/Query/FileAllInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileAllInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/Query/FileAllInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileAllInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/Query/FileAlternateNameInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileAlternateNameInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/Query/FileAlternateNameInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileAlternateNameInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/Query/FileBasicInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileBasicInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/Query/FileBasicInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileBasicInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/Query/FileCompressionInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileCompressionInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/Query/FileCompressionInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileCompressionInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/Query/FileEaInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileEaInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/Query/FileEaInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileEaInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/Query/FileInternalInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileInternalInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/Query/FileInternalInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileInternalInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/Query/FileModeInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileModeInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/Query/FileModeInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileModeInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/Query/FileNameInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileNameInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/Query/FileNameInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileNameInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/Query/FileNetworkOpenInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileNetworkOpenInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/Query/FileNetworkOpenInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileNetworkOpenInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/Query/FilePositionInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/Query/FilePositionInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/Query/FilePositionInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/Query/FilePositionInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/Query/FileStandardInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileStandardInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/Query/FileStandardInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileStandardInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/Query/FileStreamInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileStreamInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/Query/FileStreamInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/Query/FileStreamInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/QueryDirectory/FileBothDirectoryInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/QueryDirectory/FileBothDirectoryInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/QueryDirectory/FileBothDirectoryInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/QueryDirectory/FileBothDirectoryInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/QueryDirectory/FileDirectoryInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/QueryDirectory/FileDirectoryInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/QueryDirectory/FileDirectoryInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/QueryDirectory/FileDirectoryInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/QueryDirectory/FileFullDirectoryInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/QueryDirectory/FileFullDirectoryInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/QueryDirectory/FileFullDirectoryInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/QueryDirectory/FileFullDirectoryInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/QueryDirectory/FileIdBothDirectoryInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/QueryDirectory/FileIdBothDirectoryInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/QueryDirectory/FileIdBothDirectoryInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/QueryDirectory/FileIdBothDirectoryInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/QueryDirectory/FileIdFullDirectoryInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/QueryDirectory/FileIdFullDirectoryInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/QueryDirectory/FileIdFullDirectoryInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/QueryDirectory/FileIdFullDirectoryInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/QueryDirectory/FileNamesInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/QueryDirectory/FileNamesInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/QueryDirectory/FileNamesInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/QueryDirectory/FileNamesInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/QueryDirectory/QueryDirectoryFileInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/QueryDirectory/QueryDirectoryFileInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/QueryDirectory/QueryDirectoryFileInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/QueryDirectory/QueryDirectoryFileInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/Set/FileAllocationInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/Set/FileAllocationInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/Set/FileAllocationInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/Set/FileAllocationInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/Set/FileDispositionInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/Set/FileDispositionInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/Set/FileDispositionInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/Set/FileDispositionInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/Set/FileEndOfFileInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/Set/FileEndOfFileInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/Set/FileEndOfFileInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/Set/FileEndOfFileInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/Set/FileFullEAInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/Set/FileFullEAInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/Set/FileFullEAInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/Set/FileFullEAInformation.cs
diff --git a/SMBLibrary/Structures/FileInformation/Set/FileLinkInformationType2.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/Set/FileLinkInformationType2.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/Set/FileLinkInformationType2.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/Set/FileLinkInformationType2.cs
diff --git a/SMBLibrary/Structures/FileInformation/Set/FileRenameInformationType2.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/Set/FileRenameInformationType2.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/Set/FileRenameInformationType2.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/Set/FileRenameInformationType2.cs
diff --git a/SMBLibrary/Structures/FileInformation/Set/FileValidDataLengthInformation.cs b/SMBLibrary/NTFileStore/Structures/FileInformation/Set/FileValidDataLengthInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileInformation/Set/FileValidDataLengthInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileInformation/Set/FileValidDataLengthInformation.cs
diff --git a/SMBLibrary/Structures/FileSystemInformation/FileFsAttributeInformation.cs b/SMBLibrary/NTFileStore/Structures/FileSystemInformation/FileFsAttributeInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileSystemInformation/FileFsAttributeInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileSystemInformation/FileFsAttributeInformation.cs
diff --git a/SMBLibrary/Structures/FileSystemInformation/FileFsControlInformation.cs b/SMBLibrary/NTFileStore/Structures/FileSystemInformation/FileFsControlInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileSystemInformation/FileFsControlInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileSystemInformation/FileFsControlInformation.cs
diff --git a/SMBLibrary/Structures/FileSystemInformation/FileFsDeviceInformation.cs b/SMBLibrary/NTFileStore/Structures/FileSystemInformation/FileFsDeviceInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileSystemInformation/FileFsDeviceInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileSystemInformation/FileFsDeviceInformation.cs
diff --git a/SMBLibrary/Structures/FileSystemInformation/FileFsFullSizeInformation.cs b/SMBLibrary/NTFileStore/Structures/FileSystemInformation/FileFsFullSizeInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileSystemInformation/FileFsFullSizeInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileSystemInformation/FileFsFullSizeInformation.cs
diff --git a/SMBLibrary/Structures/FileSystemInformation/FileFsObjectIdInformation.cs b/SMBLibrary/NTFileStore/Structures/FileSystemInformation/FileFsObjectIdInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileSystemInformation/FileFsObjectIdInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileSystemInformation/FileFsObjectIdInformation.cs
diff --git a/SMBLibrary/Structures/FileSystemInformation/FileFsSectorSizeInformation.cs b/SMBLibrary/NTFileStore/Structures/FileSystemInformation/FileFsSectorSizeInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileSystemInformation/FileFsSectorSizeInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileSystemInformation/FileFsSectorSizeInformation.cs
diff --git a/SMBLibrary/Structures/FileSystemInformation/FileFsSizeInformation.cs b/SMBLibrary/NTFileStore/Structures/FileSystemInformation/FileFsSizeInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileSystemInformation/FileFsSizeInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileSystemInformation/FileFsSizeInformation.cs
diff --git a/SMBLibrary/Structures/FileSystemInformation/FileFsVolumeInformation.cs b/SMBLibrary/NTFileStore/Structures/FileSystemInformation/FileFsVolumeInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileSystemInformation/FileFsVolumeInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileSystemInformation/FileFsVolumeInformation.cs
diff --git a/SMBLibrary/Structures/FileSystemInformation/FileSystemInformation.cs b/SMBLibrary/NTFileStore/Structures/FileSystemInformation/FileSystemInformation.cs
similarity index 100%
rename from SMBLibrary/Structures/FileSystemInformation/FileSystemInformation.cs
rename to SMBLibrary/NTFileStore/Structures/FileSystemInformation/FileSystemInformation.cs
diff --git a/SMBLibrary/Structures/ObjectIDBufferType1.cs b/SMBLibrary/NTFileStore/Structures/ObjectIDBufferType1.cs
similarity index 100%
rename from SMBLibrary/Structures/ObjectIDBufferType1.cs
rename to SMBLibrary/NTFileStore/Structures/ObjectIDBufferType1.cs
diff --git a/SMBLibrary/Structures/SID.cs b/SMBLibrary/NTFileStore/Structures/SID.cs
similarity index 100%
rename from SMBLibrary/Structures/SID.cs
rename to SMBLibrary/NTFileStore/Structures/SID.cs
diff --git a/SMBLibrary/Structures/SecurityDescriptor.cs b/SMBLibrary/NTFileStore/Structures/SecurityDescriptor.cs
similarity index 100%
rename from SMBLibrary/Structures/SecurityDescriptor.cs
rename to SMBLibrary/NTFileStore/Structures/SecurityDescriptor.cs
diff --git a/SMBLibrary/SMBLibrary.csproj b/SMBLibrary/SMBLibrary.csproj
index 16c2865..2606433 100644
--- a/SMBLibrary/SMBLibrary.csproj
+++ b/SMBLibrary/SMBLibrary.csproj
@@ -49,18 +49,6 @@
     <Compile Include="Authentication\MD4.cs" />
     <Compile Include="Authentication\NTAuthentication.cs" />
     <Compile Include="Client\SMBClient.cs" />
-    <Compile Include="Enums\FileInformation\FileAttributes.cs" />
-    <Compile Include="Enums\FileInformation\FileInformationClass.cs" />
-    <Compile Include="Enums\FileInformation\CompressionFormat.cs" />
-    <Compile Include="Enums\FileSystemInformation\DeviceCharacteristics.cs" />
-    <Compile Include="Enums\FileSystemInformation\DeviceType.cs" />
-    <Compile Include="Enums\FileSystemInformation\FileSystemAttributes.cs" />
-    <Compile Include="Enums\FileSystemInformation\FileSystemControlFlags.cs" />
-    <Compile Include="Enums\FileSystemInformation\FileSystemInformationClass.cs" />
-    <Compile Include="Enums\FileSystemInformation\SectorSizeInformationFlags.cs" />
-    <Compile Include="Enums\NtCreateFile\CreateDisposition.cs" />
-    <Compile Include="Enums\NtCreateFile\CreateOptions.cs" />
-    <Compile Include="Enums\NtCreateFile\ShareAccess.cs" />
     <Compile Include="Enums\NTStatus.cs" />
     <Compile Include="Enums\SMBTransportType.cs" />
     <Compile Include="Enums\Win32Error.cs" />
@@ -89,6 +77,65 @@
     <Compile Include="NetBios\SessionPackets\SessionPacket.cs" />
     <Compile Include="NetBios\SessionPackets\SessionRequestPacket.cs" />
     <Compile Include="NetBios\SessionPackets\SessionRetargetResponsePacket.cs" />
+    <Compile Include="NTFileStore\Enums\FileInformation\CompressionFormat.cs" />
+    <Compile Include="NTFileStore\Enums\FileInformation\FileAttributes.cs" />
+    <Compile Include="NTFileStore\Enums\FileInformation\FileInformationClass.cs" />
+    <Compile Include="NTFileStore\Enums\FileSystemInformation\DeviceCharacteristics.cs" />
+    <Compile Include="NTFileStore\Enums\FileSystemInformation\DeviceType.cs" />
+    <Compile Include="NTFileStore\Enums\FileSystemInformation\FileSystemAttributes.cs" />
+    <Compile Include="NTFileStore\Enums\FileSystemInformation\FileSystemControlFlags.cs" />
+    <Compile Include="NTFileStore\Enums\FileSystemInformation\FileSystemInformationClass.cs" />
+    <Compile Include="NTFileStore\Enums\FileSystemInformation\SectorSizeInformationFlags.cs" />
+    <Compile Include="NTFileStore\Enums\NtCreateFile\CreateDisposition.cs" />
+    <Compile Include="NTFileStore\Enums\NtCreateFile\CreateOptions.cs" />
+    <Compile Include="NTFileStore\Enums\NtCreateFile\ShareAccess.cs" />
+    <Compile Include="NTFileStore\Structures\ACE\AccessAllowedACE.cs" />
+    <Compile Include="NTFileStore\Structures\ACE\ACE.cs" />
+    <Compile Include="NTFileStore\Structures\ACE\AceHeader.cs" />
+    <Compile Include="NTFileStore\Structures\ACE\Enums\AceFlags.cs" />
+    <Compile Include="NTFileStore\Structures\ACE\Enums\AceType.cs" />
+    <Compile Include="NTFileStore\Structures\ACL.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\FileInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\Query\FileAccessInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\Query\FileAlignmentInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\Query\FileAllInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\Query\FileAlternateNameInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\Query\FileBasicInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\Query\FileCompressionInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\Query\FileEaInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\Query\FileInternalInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\Query\FileModeInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\Query\FileNameInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\Query\FileNetworkOpenInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\Query\FilePositionInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\Query\FileStandardInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\Query\FileStreamInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\QueryDirectory\FileBothDirectoryInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\QueryDirectory\FileDirectoryInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\QueryDirectory\FileFullDirectoryInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\QueryDirectory\FileIdBothDirectoryInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\QueryDirectory\FileIdFullDirectoryInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\QueryDirectory\FileNamesInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\QueryDirectory\QueryDirectoryFileInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\Set\FileAllocationInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\Set\FileDispositionInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\Set\FileEndOfFileInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\Set\FileFullEAInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\Set\FileLinkInformationType2.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\Set\FileRenameInformationType2.cs" />
+    <Compile Include="NTFileStore\Structures\FileInformation\Set\FileValidDataLengthInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileSystemInformation\FileFsAttributeInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileSystemInformation\FileFsControlInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileSystemInformation\FileFsDeviceInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileSystemInformation\FileFsFullSizeInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileSystemInformation\FileFsObjectIdInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileSystemInformation\FileFsSectorSizeInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileSystemInformation\FileFsSizeInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileSystemInformation\FileFsVolumeInformation.cs" />
+    <Compile Include="NTFileStore\Structures\FileSystemInformation\FileSystemInformation.cs" />
+    <Compile Include="NTFileStore\Structures\ObjectIDBufferType1.cs" />
+    <Compile Include="NTFileStore\Structures\SecurityDescriptor.cs" />
+    <Compile Include="NTFileStore\Structures\SID.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RPC\Enum\NegotiationResult.cs" />
     <Compile Include="RPC\Enum\PacketFlags.cs" />
@@ -482,53 +529,6 @@
     <Compile Include="SMB2\Structures\FileID.cs" />
     <Compile Include="SMB2\Structures\LockElement.cs" />
     <Compile Include="SMB2\Structures\NegotiateContext.cs" />
-    <Compile Include="Structures\ACE\AccessAllowedACE.cs" />
-    <Compile Include="Structures\ACE\ACE.cs" />
-    <Compile Include="Structures\ACE\AceHeader.cs" />
-    <Compile Include="Structures\ACE\Enums\AceFlags.cs" />
-    <Compile Include="Structures\ACE\Enums\AceType.cs" />
-    <Compile Include="Structures\ACL.cs" />
-    <Compile Include="Structures\FileInformation\FileInformation.cs" />
-    <Compile Include="Structures\FileInformation\Query\FileAccessInformation.cs" />
-    <Compile Include="Structures\FileInformation\Query\FileAlignmentInformation.cs" />
-    <Compile Include="Structures\FileInformation\Query\FileAllInformation.cs" />
-    <Compile Include="Structures\FileInformation\Query\FileAlternateNameInformation.cs" />
-    <Compile Include="Structures\FileInformation\Query\FileBasicInformation.cs" />
-    <Compile Include="Structures\FileInformation\Query\FileCompressionInformation.cs" />
-    <Compile Include="Structures\FileInformation\Query\FileEaInformation.cs" />
-    <Compile Include="Structures\FileInformation\Query\FileInternalInformation.cs" />
-    <Compile Include="Structures\FileInformation\Query\FileModeInformation.cs" />
-    <Compile Include="Structures\FileInformation\Query\FileNameInformation.cs" />
-    <Compile Include="Structures\FileInformation\Query\FileNetworkOpenInformation.cs" />
-    <Compile Include="Structures\FileInformation\Query\FilePositionInformation.cs" />
-    <Compile Include="Structures\FileInformation\Query\FileStandardInformation.cs" />
-    <Compile Include="Structures\FileInformation\Query\FileStreamInformation.cs" />
-    <Compile Include="Structures\FileInformation\QueryDirectory\FileBothDirectoryInformation.cs" />
-    <Compile Include="Structures\FileInformation\QueryDirectory\FileDirectoryInformation.cs" />
-    <Compile Include="Structures\FileInformation\QueryDirectory\FileFullDirectoryInformation.cs" />
-    <Compile Include="Structures\FileInformation\QueryDirectory\FileIdBothDirectoryInformation.cs" />
-    <Compile Include="Structures\FileInformation\QueryDirectory\FileIdFullDirectoryInformation.cs" />
-    <Compile Include="Structures\FileInformation\QueryDirectory\FileNamesInformation.cs" />
-    <Compile Include="Structures\FileInformation\QueryDirectory\QueryDirectoryFileInformation.cs" />
-    <Compile Include="Structures\FileInformation\Set\FileAllocationInformation.cs" />
-    <Compile Include="Structures\FileInformation\Set\FileDispositionInformation.cs" />
-    <Compile Include="Structures\FileInformation\Set\FileEndOfFileInformation.cs" />
-    <Compile Include="Structures\FileInformation\Set\FileFullEAInformation.cs" />
-    <Compile Include="Structures\FileInformation\Set\FileLinkInformationType2.cs" />
-    <Compile Include="Structures\FileInformation\Set\FileRenameInformationType2.cs" />
-    <Compile Include="Structures\FileInformation\Set\FileValidDataLengthInformation.cs" />
-    <Compile Include="Structures\FileSystemInformation\FileFsAttributeInformation.cs" />
-    <Compile Include="Structures\FileSystemInformation\FileFsControlInformation.cs" />
-    <Compile Include="Structures\FileSystemInformation\FileFsDeviceInformation.cs" />
-    <Compile Include="Structures\FileSystemInformation\FileFsFullSizeInformation.cs" />
-    <Compile Include="Structures\FileSystemInformation\FileFsObjectIdInformation.cs" />
-    <Compile Include="Structures\FileSystemInformation\FileFsSectorSizeInformation.cs" />
-    <Compile Include="Structures\FileSystemInformation\FileFsSizeInformation.cs" />
-    <Compile Include="Structures\FileSystemInformation\FileFsVolumeInformation.cs" />
-    <Compile Include="Structures\FileSystemInformation\FileSystemInformation.cs" />
-    <Compile Include="Structures\ObjectIDBufferType1.cs" />
-    <Compile Include="Structures\SecurityDescriptor.cs" />
-    <Compile Include="Structures\SID.cs" />
     <Compile Include="Tests\AuthenticationTests.cs" />
     <Compile Include="Tests\NetBiosTests.cs" />
     <Compile Include="Tests\RPCTests.cs" />