diff --git a/SMBLibrary/SMB1/SMBCommands/CheckDirectoryRequest.cs b/SMBLibrary/SMB1/Commands/CheckDirectoryRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/CheckDirectoryRequest.cs
rename to SMBLibrary/SMB1/Commands/CheckDirectoryRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/CheckDirectoryResponse.cs b/SMBLibrary/SMB1/Commands/CheckDirectoryResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/CheckDirectoryResponse.cs
rename to SMBLibrary/SMB1/Commands/CheckDirectoryResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/CloseRequest.cs b/SMBLibrary/SMB1/Commands/CloseRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/CloseRequest.cs
rename to SMBLibrary/SMB1/Commands/CloseRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/CloseResponse.cs b/SMBLibrary/SMB1/Commands/CloseResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/CloseResponse.cs
rename to SMBLibrary/SMB1/Commands/CloseResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/CreateDirectoryRequest.cs b/SMBLibrary/SMB1/Commands/CreateDirectoryRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/CreateDirectoryRequest.cs
rename to SMBLibrary/SMB1/Commands/CreateDirectoryRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/CreateDirectoryResponse.cs b/SMBLibrary/SMB1/Commands/CreateDirectoryResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/CreateDirectoryResponse.cs
rename to SMBLibrary/SMB1/Commands/CreateDirectoryResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/DeleteDirectoryRequest.cs b/SMBLibrary/SMB1/Commands/DeleteDirectoryRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/DeleteDirectoryRequest.cs
rename to SMBLibrary/SMB1/Commands/DeleteDirectoryRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/DeleteDirectoryResponse.cs b/SMBLibrary/SMB1/Commands/DeleteDirectoryResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/DeleteDirectoryResponse.cs
rename to SMBLibrary/SMB1/Commands/DeleteDirectoryResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/DeleteRequest.cs b/SMBLibrary/SMB1/Commands/DeleteRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/DeleteRequest.cs
rename to SMBLibrary/SMB1/Commands/DeleteRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/DeleteResponse.cs b/SMBLibrary/SMB1/Commands/DeleteResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/DeleteResponse.cs
rename to SMBLibrary/SMB1/Commands/DeleteResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/EchoRequest.cs b/SMBLibrary/SMB1/Commands/EchoRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/EchoRequest.cs
rename to SMBLibrary/SMB1/Commands/EchoRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/EchoResponse.cs b/SMBLibrary/SMB1/Commands/EchoResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/EchoResponse.cs
rename to SMBLibrary/SMB1/Commands/EchoResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/ErrorResponse.cs b/SMBLibrary/SMB1/Commands/ErrorResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/ErrorResponse.cs
rename to SMBLibrary/SMB1/Commands/ErrorResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/FindClose2Request.cs b/SMBLibrary/SMB1/Commands/FindClose2Request.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/FindClose2Request.cs
rename to SMBLibrary/SMB1/Commands/FindClose2Request.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/FindClose2Response.cs b/SMBLibrary/SMB1/Commands/FindClose2Response.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/FindClose2Response.cs
rename to SMBLibrary/SMB1/Commands/FindClose2Response.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/FlushRequest.cs b/SMBLibrary/SMB1/Commands/FlushRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/FlushRequest.cs
rename to SMBLibrary/SMB1/Commands/FlushRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/FlushResponse.cs b/SMBLibrary/SMB1/Commands/FlushResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/FlushResponse.cs
rename to SMBLibrary/SMB1/Commands/FlushResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/LockingAndXRequest.cs b/SMBLibrary/SMB1/Commands/LockingAndXRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/LockingAndXRequest.cs
rename to SMBLibrary/SMB1/Commands/LockingAndXRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/LockingAndXResponse.cs b/SMBLibrary/SMB1/Commands/LockingAndXResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/LockingAndXResponse.cs
rename to SMBLibrary/SMB1/Commands/LockingAndXResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/LogoffAndXRequest.cs b/SMBLibrary/SMB1/Commands/LogoffAndXRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/LogoffAndXRequest.cs
rename to SMBLibrary/SMB1/Commands/LogoffAndXRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/LogoffAndXResponse.cs b/SMBLibrary/SMB1/Commands/LogoffAndXResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/LogoffAndXResponse.cs
rename to SMBLibrary/SMB1/Commands/LogoffAndXResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/NTCreateAndXRequest.cs b/SMBLibrary/SMB1/Commands/NTCreateAndXRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/NTCreateAndXRequest.cs
rename to SMBLibrary/SMB1/Commands/NTCreateAndXRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/NTCreateAndXResponse.cs b/SMBLibrary/SMB1/Commands/NTCreateAndXResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/NTCreateAndXResponse.cs
rename to SMBLibrary/SMB1/Commands/NTCreateAndXResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/NTCreateAndXResponseExtended.cs b/SMBLibrary/SMB1/Commands/NTCreateAndXResponseExtended.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/NTCreateAndXResponseExtended.cs
rename to SMBLibrary/SMB1/Commands/NTCreateAndXResponseExtended.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/NTTransactInterimResponse.cs b/SMBLibrary/SMB1/Commands/NTTransactInterimResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/NTTransactInterimResponse.cs
rename to SMBLibrary/SMB1/Commands/NTTransactInterimResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/NTTransactRequest.cs b/SMBLibrary/SMB1/Commands/NTTransactRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/NTTransactRequest.cs
rename to SMBLibrary/SMB1/Commands/NTTransactRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/NTTransactResponse.cs b/SMBLibrary/SMB1/Commands/NTTransactResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/NTTransactResponse.cs
rename to SMBLibrary/SMB1/Commands/NTTransactResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/NTTransactSecondaryRequest.cs b/SMBLibrary/SMB1/Commands/NTTransactSecondaryRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/NTTransactSecondaryRequest.cs
rename to SMBLibrary/SMB1/Commands/NTTransactSecondaryRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/NegotiateRequest.cs b/SMBLibrary/SMB1/Commands/NegotiateRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/NegotiateRequest.cs
rename to SMBLibrary/SMB1/Commands/NegotiateRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/NegotiateResponseNTLM.cs b/SMBLibrary/SMB1/Commands/NegotiateResponseNTLM.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/NegotiateResponseNTLM.cs
rename to SMBLibrary/SMB1/Commands/NegotiateResponseNTLM.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/NegotiateResponseNTLMExtended.cs b/SMBLibrary/SMB1/Commands/NegotiateResponseNTLMExtended.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/NegotiateResponseNTLMExtended.cs
rename to SMBLibrary/SMB1/Commands/NegotiateResponseNTLMExtended.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/NegotiateResponseNotSupported.cs b/SMBLibrary/SMB1/Commands/NegotiateResponseNotSupported.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/NegotiateResponseNotSupported.cs
rename to SMBLibrary/SMB1/Commands/NegotiateResponseNotSupported.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/OpenAndXRequest.cs b/SMBLibrary/SMB1/Commands/OpenAndXRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/OpenAndXRequest.cs
rename to SMBLibrary/SMB1/Commands/OpenAndXRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/OpenAndXResponse.cs b/SMBLibrary/SMB1/Commands/OpenAndXResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/OpenAndXResponse.cs
rename to SMBLibrary/SMB1/Commands/OpenAndXResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/OpenAndXResponseExtended.cs b/SMBLibrary/SMB1/Commands/OpenAndXResponseExtended.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/OpenAndXResponseExtended.cs
rename to SMBLibrary/SMB1/Commands/OpenAndXResponseExtended.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/QueryInformationRequest.cs b/SMBLibrary/SMB1/Commands/QueryInformationRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/QueryInformationRequest.cs
rename to SMBLibrary/SMB1/Commands/QueryInformationRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/QueryInformationResponse.cs b/SMBLibrary/SMB1/Commands/QueryInformationResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/QueryInformationResponse.cs
rename to SMBLibrary/SMB1/Commands/QueryInformationResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/ReadAndXRequest.cs b/SMBLibrary/SMB1/Commands/ReadAndXRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/ReadAndXRequest.cs
rename to SMBLibrary/SMB1/Commands/ReadAndXRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/ReadAndXResponse.cs b/SMBLibrary/SMB1/Commands/ReadAndXResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/ReadAndXResponse.cs
rename to SMBLibrary/SMB1/Commands/ReadAndXResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/ReadRequest.cs b/SMBLibrary/SMB1/Commands/ReadRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/ReadRequest.cs
rename to SMBLibrary/SMB1/Commands/ReadRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/ReadResponse.cs b/SMBLibrary/SMB1/Commands/ReadResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/ReadResponse.cs
rename to SMBLibrary/SMB1/Commands/ReadResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/RenameRequest.cs b/SMBLibrary/SMB1/Commands/RenameRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/RenameRequest.cs
rename to SMBLibrary/SMB1/Commands/RenameRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/RenameResponse.cs b/SMBLibrary/SMB1/Commands/RenameResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/RenameResponse.cs
rename to SMBLibrary/SMB1/Commands/RenameResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/SMBAndXCommand.cs b/SMBLibrary/SMB1/Commands/SMBAndXCommand.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/SMBAndXCommand.cs
rename to SMBLibrary/SMB1/Commands/SMBAndXCommand.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/SMBCommand.cs b/SMBLibrary/SMB1/Commands/SMBCommand.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/SMBCommand.cs
rename to SMBLibrary/SMB1/Commands/SMBCommand.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/SessionSetupAndXRequest.cs b/SMBLibrary/SMB1/Commands/SessionSetupAndXRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/SessionSetupAndXRequest.cs
rename to SMBLibrary/SMB1/Commands/SessionSetupAndXRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/SessionSetupAndXRequestExtended.cs b/SMBLibrary/SMB1/Commands/SessionSetupAndXRequestExtended.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/SessionSetupAndXRequestExtended.cs
rename to SMBLibrary/SMB1/Commands/SessionSetupAndXRequestExtended.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/SessionSetupAndXResponse.cs b/SMBLibrary/SMB1/Commands/SessionSetupAndXResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/SessionSetupAndXResponse.cs
rename to SMBLibrary/SMB1/Commands/SessionSetupAndXResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/SessionSetupAndXResponseExtended.cs b/SMBLibrary/SMB1/Commands/SessionSetupAndXResponseExtended.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/SessionSetupAndXResponseExtended.cs
rename to SMBLibrary/SMB1/Commands/SessionSetupAndXResponseExtended.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/SetInformation2Request.cs b/SMBLibrary/SMB1/Commands/SetInformation2Request.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/SetInformation2Request.cs
rename to SMBLibrary/SMB1/Commands/SetInformation2Request.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/SetInformation2Response.cs b/SMBLibrary/SMB1/Commands/SetInformation2Response.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/SetInformation2Response.cs
rename to SMBLibrary/SMB1/Commands/SetInformation2Response.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/SetInformationRequest.cs b/SMBLibrary/SMB1/Commands/SetInformationRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/SetInformationRequest.cs
rename to SMBLibrary/SMB1/Commands/SetInformationRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/SetInformationResponse.cs b/SMBLibrary/SMB1/Commands/SetInformationResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/SetInformationResponse.cs
rename to SMBLibrary/SMB1/Commands/SetInformationResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/Transaction2Request.cs b/SMBLibrary/SMB1/Commands/Transaction2Request.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/Transaction2Request.cs
rename to SMBLibrary/SMB1/Commands/Transaction2Request.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/Transaction2Response.cs b/SMBLibrary/SMB1/Commands/Transaction2Response.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/Transaction2Response.cs
rename to SMBLibrary/SMB1/Commands/Transaction2Response.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/Transaction2SecondaryRequest.cs b/SMBLibrary/SMB1/Commands/Transaction2SecondaryRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/Transaction2SecondaryRequest.cs
rename to SMBLibrary/SMB1/Commands/Transaction2SecondaryRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/TransactionRequest.cs b/SMBLibrary/SMB1/Commands/TransactionRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/TransactionRequest.cs
rename to SMBLibrary/SMB1/Commands/TransactionRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/TransactionResponse.cs b/SMBLibrary/SMB1/Commands/TransactionResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/TransactionResponse.cs
rename to SMBLibrary/SMB1/Commands/TransactionResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/TransactionSecondaryRequest.cs b/SMBLibrary/SMB1/Commands/TransactionSecondaryRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/TransactionSecondaryRequest.cs
rename to SMBLibrary/SMB1/Commands/TransactionSecondaryRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/TreeConnectAndXRequest.cs b/SMBLibrary/SMB1/Commands/TreeConnectAndXRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/TreeConnectAndXRequest.cs
rename to SMBLibrary/SMB1/Commands/TreeConnectAndXRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/TreeConnectAndXResponse.cs b/SMBLibrary/SMB1/Commands/TreeConnectAndXResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/TreeConnectAndXResponse.cs
rename to SMBLibrary/SMB1/Commands/TreeConnectAndXResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/TreeConnectAndXResponseExtended.cs b/SMBLibrary/SMB1/Commands/TreeConnectAndXResponseExtended.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/TreeConnectAndXResponseExtended.cs
rename to SMBLibrary/SMB1/Commands/TreeConnectAndXResponseExtended.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/TreeDisconnectRequest.cs b/SMBLibrary/SMB1/Commands/TreeDisconnectRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/TreeDisconnectRequest.cs
rename to SMBLibrary/SMB1/Commands/TreeDisconnectRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/TreeDisconnectResponse.cs b/SMBLibrary/SMB1/Commands/TreeDisconnectResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/TreeDisconnectResponse.cs
rename to SMBLibrary/SMB1/Commands/TreeDisconnectResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/WriteAndXRequest.cs b/SMBLibrary/SMB1/Commands/WriteAndXRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/WriteAndXRequest.cs
rename to SMBLibrary/SMB1/Commands/WriteAndXRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/WriteAndXResponse.cs b/SMBLibrary/SMB1/Commands/WriteAndXResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/WriteAndXResponse.cs
rename to SMBLibrary/SMB1/Commands/WriteAndXResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/WriteRawFinalResponse.cs b/SMBLibrary/SMB1/Commands/WriteRawFinalResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/WriteRawFinalResponse.cs
rename to SMBLibrary/SMB1/Commands/WriteRawFinalResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/WriteRawInterimResponse.cs b/SMBLibrary/SMB1/Commands/WriteRawInterimResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/WriteRawInterimResponse.cs
rename to SMBLibrary/SMB1/Commands/WriteRawInterimResponse.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/WriteRawRequest.cs b/SMBLibrary/SMB1/Commands/WriteRawRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/WriteRawRequest.cs
rename to SMBLibrary/SMB1/Commands/WriteRawRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/WriteRequest.cs b/SMBLibrary/SMB1/Commands/WriteRequest.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/WriteRequest.cs
rename to SMBLibrary/SMB1/Commands/WriteRequest.cs
diff --git a/SMBLibrary/SMB1/SMBCommands/WriteResponse.cs b/SMBLibrary/SMB1/Commands/WriteResponse.cs
similarity index 100%
rename from SMBLibrary/SMB1/SMBCommands/WriteResponse.cs
rename to SMBLibrary/SMB1/Commands/WriteResponse.cs
diff --git a/SMBLibrary/SMBLibrary.csproj b/SMBLibrary/SMBLibrary.csproj
index ee196c3..eb124c3 100644
--- a/SMBLibrary/SMBLibrary.csproj
+++ b/SMBLibrary/SMBLibrary.csproj
@@ -163,6 +163,77 @@
     <Compile Include="Services\WorkstationService\Structures\WorkstationInfo101.cs" />
     <Compile Include="Services\WorkstationService\Structures\WorkstationInfoLevel.cs" />
     <Compile Include="Services\WorkstationService\WorkstationService.cs" />
+    <Compile Include="SMB1\Commands\CheckDirectoryRequest.cs" />
+    <Compile Include="SMB1\Commands\CheckDirectoryResponse.cs" />
+    <Compile Include="SMB1\Commands\CloseRequest.cs" />
+    <Compile Include="SMB1\Commands\CloseResponse.cs" />
+    <Compile Include="SMB1\Commands\CreateDirectoryRequest.cs" />
+    <Compile Include="SMB1\Commands\CreateDirectoryResponse.cs" />
+    <Compile Include="SMB1\Commands\DeleteDirectoryRequest.cs" />
+    <Compile Include="SMB1\Commands\DeleteDirectoryResponse.cs" />
+    <Compile Include="SMB1\Commands\DeleteRequest.cs" />
+    <Compile Include="SMB1\Commands\DeleteResponse.cs" />
+    <Compile Include="SMB1\Commands\EchoRequest.cs" />
+    <Compile Include="SMB1\Commands\EchoResponse.cs" />
+    <Compile Include="SMB1\Commands\ErrorResponse.cs" />
+    <Compile Include="SMB1\Commands\FindClose2Request.cs" />
+    <Compile Include="SMB1\Commands\FindClose2Response.cs" />
+    <Compile Include="SMB1\Commands\FlushRequest.cs" />
+    <Compile Include="SMB1\Commands\FlushResponse.cs" />
+    <Compile Include="SMB1\Commands\LockingAndXRequest.cs" />
+    <Compile Include="SMB1\Commands\LockingAndXResponse.cs" />
+    <Compile Include="SMB1\Commands\LogoffAndXRequest.cs" />
+    <Compile Include="SMB1\Commands\LogoffAndXResponse.cs" />
+    <Compile Include="SMB1\Commands\NegotiateRequest.cs" />
+    <Compile Include="SMB1\Commands\NegotiateResponseNotSupported.cs" />
+    <Compile Include="SMB1\Commands\NegotiateResponseNTLM.cs" />
+    <Compile Include="SMB1\Commands\NegotiateResponseNTLMExtended.cs" />
+    <Compile Include="SMB1\Commands\NTCreateAndXRequest.cs" />
+    <Compile Include="SMB1\Commands\NTCreateAndXResponse.cs" />
+    <Compile Include="SMB1\Commands\NTCreateAndXResponseExtended.cs" />
+    <Compile Include="SMB1\Commands\NTTransactInterimResponse.cs" />
+    <Compile Include="SMB1\Commands\NTTransactRequest.cs" />
+    <Compile Include="SMB1\Commands\NTTransactResponse.cs" />
+    <Compile Include="SMB1\Commands\NTTransactSecondaryRequest.cs" />
+    <Compile Include="SMB1\Commands\OpenAndXRequest.cs" />
+    <Compile Include="SMB1\Commands\OpenAndXResponse.cs" />
+    <Compile Include="SMB1\Commands\OpenAndXResponseExtended.cs" />
+    <Compile Include="SMB1\Commands\QueryInformationRequest.cs" />
+    <Compile Include="SMB1\Commands\QueryInformationResponse.cs" />
+    <Compile Include="SMB1\Commands\ReadAndXRequest.cs" />
+    <Compile Include="SMB1\Commands\ReadAndXResponse.cs" />
+    <Compile Include="SMB1\Commands\ReadRequest.cs" />
+    <Compile Include="SMB1\Commands\ReadResponse.cs" />
+    <Compile Include="SMB1\Commands\RenameRequest.cs" />
+    <Compile Include="SMB1\Commands\RenameResponse.cs" />
+    <Compile Include="SMB1\Commands\SessionSetupAndXRequest.cs" />
+    <Compile Include="SMB1\Commands\SessionSetupAndXRequestExtended.cs" />
+    <Compile Include="SMB1\Commands\SessionSetupAndXResponse.cs" />
+    <Compile Include="SMB1\Commands\SessionSetupAndXResponseExtended.cs" />
+    <Compile Include="SMB1\Commands\SetInformation2Request.cs" />
+    <Compile Include="SMB1\Commands\SetInformation2Response.cs" />
+    <Compile Include="SMB1\Commands\SetInformationRequest.cs" />
+    <Compile Include="SMB1\Commands\SetInformationResponse.cs" />
+    <Compile Include="SMB1\Commands\SMBAndXCommand.cs" />
+    <Compile Include="SMB1\Commands\SMBCommand.cs" />
+    <Compile Include="SMB1\Commands\Transaction2Request.cs" />
+    <Compile Include="SMB1\Commands\Transaction2Response.cs" />
+    <Compile Include="SMB1\Commands\Transaction2SecondaryRequest.cs" />
+    <Compile Include="SMB1\Commands\TransactionRequest.cs" />
+    <Compile Include="SMB1\Commands\TransactionResponse.cs" />
+    <Compile Include="SMB1\Commands\TransactionSecondaryRequest.cs" />
+    <Compile Include="SMB1\Commands\TreeConnectAndXRequest.cs" />
+    <Compile Include="SMB1\Commands\TreeConnectAndXResponse.cs" />
+    <Compile Include="SMB1\Commands\TreeConnectAndXResponseExtended.cs" />
+    <Compile Include="SMB1\Commands\TreeDisconnectRequest.cs" />
+    <Compile Include="SMB1\Commands\TreeDisconnectResponse.cs" />
+    <Compile Include="SMB1\Commands\WriteAndXRequest.cs" />
+    <Compile Include="SMB1\Commands\WriteAndXResponse.cs" />
+    <Compile Include="SMB1\Commands\WriteRawFinalResponse.cs" />
+    <Compile Include="SMB1\Commands\WriteRawInterimResponse.cs" />
+    <Compile Include="SMB1\Commands\WriteRawRequest.cs" />
+    <Compile Include="SMB1\Commands\WriteRequest.cs" />
+    <Compile Include="SMB1\Commands\WriteResponse.cs" />
     <Compile Include="SMB1\Enums\CommandName.cs" />
     <Compile Include="SMB1\Enums\ExtendedFileAttributes.cs" />
     <Compile Include="SMB1\Enums\FileAttributes.cs" />
@@ -200,77 +271,6 @@
     <Compile Include="SMB1\NTTransactSubcommands\NTTransactQuerySecurityDescriptorResponse.cs" />
     <Compile Include="SMB1\NTTransactSubcommands\NTTransactSetSecurityDescriptor.cs" />
     <Compile Include="SMB1\NTTransactSubcommands\NTTransactSubcommand.cs" />
-    <Compile Include="SMB1\SMBCommands\CheckDirectoryRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\CheckDirectoryResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\CloseRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\CloseResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\CreateDirectoryRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\CreateDirectoryResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\DeleteDirectoryRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\DeleteDirectoryResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\DeleteRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\DeleteResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\EchoRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\EchoResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\ErrorResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\FindClose2Request.cs" />
-    <Compile Include="SMB1\SMBCommands\FindClose2Response.cs" />
-    <Compile Include="SMB1\SMBCommands\FlushRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\FlushResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\LockingAndXRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\LockingAndXResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\LogoffAndXRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\LogoffAndXResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\NegotiateRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\NegotiateResponseNotSupported.cs" />
-    <Compile Include="SMB1\SMBCommands\NegotiateResponseNTLM.cs" />
-    <Compile Include="SMB1\SMBCommands\NegotiateResponseNTLMExtended.cs" />
-    <Compile Include="SMB1\SMBCommands\NTCreateAndXRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\NTCreateAndXResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\NTCreateAndXResponseExtended.cs" />
-    <Compile Include="SMB1\SMBCommands\NTTransactInterimResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\NTTransactRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\NTTransactResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\NTTransactSecondaryRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\OpenAndXRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\OpenAndXResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\OpenAndXResponseExtended.cs" />
-    <Compile Include="SMB1\SMBCommands\QueryInformationRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\QueryInformationResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\ReadAndXRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\ReadAndXResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\ReadRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\ReadResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\RenameRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\RenameResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\SessionSetupAndXRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\SessionSetupAndXRequestExtended.cs" />
-    <Compile Include="SMB1\SMBCommands\SessionSetupAndXResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\SessionSetupAndXResponseExtended.cs" />
-    <Compile Include="SMB1\SMBCommands\SetInformation2Request.cs" />
-    <Compile Include="SMB1\SMBCommands\SetInformation2Response.cs" />
-    <Compile Include="SMB1\SMBCommands\SetInformationRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\SetInformationResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\SMBAndXCommand.cs" />
-    <Compile Include="SMB1\SMBCommands\SMBCommand.cs" />
-    <Compile Include="SMB1\SMBCommands\Transaction2Request.cs" />
-    <Compile Include="SMB1\SMBCommands\Transaction2Response.cs" />
-    <Compile Include="SMB1\SMBCommands\Transaction2SecondaryRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\TransactionRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\TransactionResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\TransactionSecondaryRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\TreeConnectAndXRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\TreeConnectAndXResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\TreeConnectAndXResponseExtended.cs" />
-    <Compile Include="SMB1\SMBCommands\TreeDisconnectRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\TreeDisconnectResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\WriteAndXRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\WriteAndXResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\WriteRawFinalResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\WriteRawInterimResponse.cs" />
-    <Compile Include="SMB1\SMBCommands\WriteRawRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\WriteRequest.cs" />
-    <Compile Include="SMB1\SMBCommands\WriteResponse.cs" />
     <Compile Include="SMB1\SMBHeader.cs" />
     <Compile Include="SMB1\SMBHelper.cs" />
     <Compile Include="SMB1\SMBMessage.cs" />