diff --git a/SMBLibrary/SMBLibrary.csproj b/SMBLibrary/SMBLibrary.csproj
index 7caddbb..41b2d6f 100644
--- a/SMBLibrary/SMBLibrary.csproj
+++ b/SMBLibrary/SMBLibrary.csproj
@@ -107,29 +107,29 @@
     <Compile Include="Server\Exceptions\EmptyPasswordNotAllowedException.cs" />
     <Compile Include="Server\Exceptions\InvalidRequestException.cs" />
     <Compile Include="Server\Exceptions\UnsupportedInformationLevelException.cs" />
+    <Compile Include="Server\Helpers\IOExceptionHelper.cs" />
+    <Compile Include="Server\Helpers\ServerPathUtils.cs" />
     <Compile Include="Server\IndependentUserCollection.cs" />
     <Compile Include="Server\INTLMAuthenticationProvider.cs" />
     <Compile Include="Server\NameServer.cs" />
     <Compile Include="Server\OpenedFileObject.cs" />
     <Compile Include="Server\ProcessStateObject.cs" />
-    <Compile Include="Server\ResponseHelpers\FileSystemResponseHelper.cs" />
-    <Compile Include="Server\ResponseHelpers\InfoHelper.cs" />
-    <Compile Include="Server\ResponseHelpers\IOExceptionHelper.cs" />
-    <Compile Include="Server\ResponseHelpers\NegotiateHelper.cs" />
-    <Compile Include="Server\ResponseHelpers\NTCreateHelper.cs" />
-    <Compile Include="Server\ResponseHelpers\NTTransactHelper.cs" />
-    <Compile Include="Server\ResponseHelpers\OpenAndXHelper.cs" />
-    <Compile Include="Server\ResponseHelpers\ReadWriteResponseHelper.cs" />
-    <Compile Include="Server\ResponseHelpers\ServerPathUtils.cs" />
-    <Compile Include="Server\ResponseHelpers\ServerResponseHelper.cs" />
-    <Compile Include="Server\ResponseHelpers\Transaction2SubcommandHelper.cs" />
-    <Compile Include="Server\ResponseHelpers\TransactionHelper.cs" />
-    <Compile Include="Server\ResponseHelpers\TransactionSubcommandHelper.cs" />
-    <Compile Include="Server\ResponseHelpers\TreeConnectHelper.cs" />
     <Compile Include="Server\Shares\FileSystemShare.cs" />
     <Compile Include="Server\Shares\ISMBShare.cs" />
     <Compile Include="Server\Shares\NamedPipeShare.cs" />
     <Compile Include="Server\Shares\ShareCollection.cs" />
+    <Compile Include="Server\SMB1\FileSystemResponseHelper.cs" />
+    <Compile Include="Server\SMB1\InfoHelper.cs" />
+    <Compile Include="Server\SMB1\NegotiateHelper.cs" />
+    <Compile Include="Server\SMB1\NTCreateHelper.cs" />
+    <Compile Include="Server\SMB1\NTTransactHelper.cs" />
+    <Compile Include="Server\SMB1\OpenAndXHelper.cs" />
+    <Compile Include="Server\SMB1\ReadWriteResponseHelper.cs" />
+    <Compile Include="Server\SMB1\ServerResponseHelper.cs" />
+    <Compile Include="Server\SMB1\Transaction2SubcommandHelper.cs" />
+    <Compile Include="Server\SMB1\TransactionHelper.cs" />
+    <Compile Include="Server\SMB1\TransactionSubcommandHelper.cs" />
+    <Compile Include="Server\SMB1\TreeConnectHelper.cs" />
     <Compile Include="Server\SMBServer.cs" />
     <Compile Include="Server\User.cs" />
     <Compile Include="Server\UserCollection.cs" />
diff --git a/SMBLibrary/Server/ResponseHelpers/IOExceptionHelper.cs b/SMBLibrary/Server/Helpers/IOExceptionHelper.cs
similarity index 100%
rename from SMBLibrary/Server/ResponseHelpers/IOExceptionHelper.cs
rename to SMBLibrary/Server/Helpers/IOExceptionHelper.cs
diff --git a/SMBLibrary/Server/ResponseHelpers/ServerPathUtils.cs b/SMBLibrary/Server/Helpers/ServerPathUtils.cs
similarity index 100%
rename from SMBLibrary/Server/ResponseHelpers/ServerPathUtils.cs
rename to SMBLibrary/Server/Helpers/ServerPathUtils.cs
diff --git a/SMBLibrary/Server/ResponseHelpers/FileSystemResponseHelper.cs b/SMBLibrary/Server/SMB1/FileSystemResponseHelper.cs
similarity index 97%
rename from SMBLibrary/Server/ResponseHelpers/FileSystemResponseHelper.cs
rename to SMBLibrary/Server/SMB1/FileSystemResponseHelper.cs
index a6e4872..761605e 100644
--- a/SMBLibrary/Server/ResponseHelpers/FileSystemResponseHelper.cs
+++ b/SMBLibrary/Server/SMB1/FileSystemResponseHelper.cs
@@ -11,7 +11,7 @@ using System.Text;
 using SMBLibrary.SMB1;
 using Utilities;
 
-namespace SMBLibrary.Server
+namespace SMBLibrary.Server.SMB1
 {
     public class FileSystemResponseHelper
     {
diff --git a/SMBLibrary/Server/ResponseHelpers/InfoHelper.cs b/SMBLibrary/Server/SMB1/InfoHelper.cs
similarity index 97%
rename from SMBLibrary/Server/ResponseHelpers/InfoHelper.cs
rename to SMBLibrary/Server/SMB1/InfoHelper.cs
index b45692d..b884a1a 100644
--- a/SMBLibrary/Server/ResponseHelpers/InfoHelper.cs
+++ b/SMBLibrary/Server/SMB1/InfoHelper.cs
@@ -10,7 +10,7 @@ using System.Text;
 using SMBLibrary.SMB1;
 using Utilities;
 
-namespace SMBLibrary.Server
+namespace SMBLibrary.Server.SMB1
 {
     public class InfoHelper
     {
diff --git a/SMBLibrary/Server/ResponseHelpers/NTCreateHelper.cs b/SMBLibrary/Server/SMB1/NTCreateHelper.cs
similarity index 97%
rename from SMBLibrary/Server/ResponseHelpers/NTCreateHelper.cs
rename to SMBLibrary/Server/SMB1/NTCreateHelper.cs
index d7c46c5..becff02 100644
--- a/SMBLibrary/Server/ResponseHelpers/NTCreateHelper.cs
+++ b/SMBLibrary/Server/SMB1/NTCreateHelper.cs
@@ -12,7 +12,7 @@ using SMBLibrary.Services;
 using SMBLibrary.SMB1;
 using Utilities;
 
-namespace SMBLibrary.Server
+namespace SMBLibrary.Server.SMB1
 {
     public class NTCreateHelper
     {
diff --git a/SMBLibrary/Server/ResponseHelpers/NTTransactHelper.cs b/SMBLibrary/Server/SMB1/NTTransactHelper.cs
similarity index 97%
rename from SMBLibrary/Server/ResponseHelpers/NTTransactHelper.cs
rename to SMBLibrary/Server/SMB1/NTTransactHelper.cs
index 1f49ae6..903ff00 100644
--- a/SMBLibrary/Server/ResponseHelpers/NTTransactHelper.cs
+++ b/SMBLibrary/Server/SMB1/NTTransactHelper.cs
@@ -10,7 +10,7 @@ using System.Text;
 using SMBLibrary.SMB1;
 using Utilities;
 
-namespace SMBLibrary.Server
+namespace SMBLibrary.Server.SMB1
 {
     public class NTTransactHelper
     {
diff --git a/SMBLibrary/Server/ResponseHelpers/NegotiateHelper.cs b/SMBLibrary/Server/SMB1/NegotiateHelper.cs
similarity index 97%
rename from SMBLibrary/Server/ResponseHelpers/NegotiateHelper.cs
rename to SMBLibrary/Server/SMB1/NegotiateHelper.cs
index 041ec8d..7f0e65a 100644
--- a/SMBLibrary/Server/ResponseHelpers/NegotiateHelper.cs
+++ b/SMBLibrary/Server/SMB1/NegotiateHelper.cs
@@ -11,7 +11,7 @@ using SMBLibrary.Authentication;
 using SMBLibrary.SMB1;
 using Utilities;
 
-namespace SMBLibrary.Server
+namespace SMBLibrary.Server.SMB1
 {
     /// <summary>
     /// Negotiate and Session Setup helper
diff --git a/SMBLibrary/Server/ResponseHelpers/OpenAndXHelper.cs b/SMBLibrary/Server/SMB1/OpenAndXHelper.cs
similarity index 97%
rename from SMBLibrary/Server/ResponseHelpers/OpenAndXHelper.cs
rename to SMBLibrary/Server/SMB1/OpenAndXHelper.cs
index e42af2a..9bb4d4f 100644
--- a/SMBLibrary/Server/ResponseHelpers/OpenAndXHelper.cs
+++ b/SMBLibrary/Server/SMB1/OpenAndXHelper.cs
@@ -12,7 +12,7 @@ using SMBLibrary.Services;
 using SMBLibrary.SMB1;
 using Utilities;
 
-namespace SMBLibrary.Server
+namespace SMBLibrary.Server.SMB1
 {
     public class OpenAndXHelper
     {
diff --git a/SMBLibrary/Server/ResponseHelpers/ReadWriteResponseHelper.cs b/SMBLibrary/Server/SMB1/ReadWriteResponseHelper.cs
similarity index 97%
rename from SMBLibrary/Server/ResponseHelpers/ReadWriteResponseHelper.cs
rename to SMBLibrary/Server/SMB1/ReadWriteResponseHelper.cs
index 4b99af9..d4a7565 100644
--- a/SMBLibrary/Server/ResponseHelpers/ReadWriteResponseHelper.cs
+++ b/SMBLibrary/Server/SMB1/ReadWriteResponseHelper.cs
@@ -13,7 +13,7 @@ using SMBLibrary.SMB1;
 using SMBLibrary.Services;
 using Utilities;
 
-namespace SMBLibrary.Server
+namespace SMBLibrary.Server.SMB1
 {
     public class ReadWriteResponseHelper
     {
diff --git a/SMBLibrary/Server/ResponseHelpers/ServerResponseHelper.cs b/SMBLibrary/Server/SMB1/ServerResponseHelper.cs
similarity index 96%
rename from SMBLibrary/Server/ResponseHelpers/ServerResponseHelper.cs
rename to SMBLibrary/Server/SMB1/ServerResponseHelper.cs
index de249c3..6951ab7 100644
--- a/SMBLibrary/Server/ResponseHelpers/ServerResponseHelper.cs
+++ b/SMBLibrary/Server/SMB1/ServerResponseHelper.cs
@@ -11,7 +11,7 @@ using System.Text;
 using SMBLibrary.SMB1;
 using Utilities;
 
-namespace SMBLibrary.Server
+namespace SMBLibrary.Server.SMB1
 {
     public partial class ServerResponseHelper
     {
diff --git a/SMBLibrary/Server/ResponseHelpers/Transaction2SubcommandHelper.cs b/SMBLibrary/Server/SMB1/Transaction2SubcommandHelper.cs
similarity index 97%
rename from SMBLibrary/Server/ResponseHelpers/Transaction2SubcommandHelper.cs
rename to SMBLibrary/Server/SMB1/Transaction2SubcommandHelper.cs
index e781ac5..47294d9 100644
--- a/SMBLibrary/Server/ResponseHelpers/Transaction2SubcommandHelper.cs
+++ b/SMBLibrary/Server/SMB1/Transaction2SubcommandHelper.cs
@@ -11,7 +11,7 @@ using System.Text;
 using SMBLibrary.SMB1;
 using Utilities;
 
-namespace SMBLibrary.Server
+namespace SMBLibrary.Server.SMB1
 {
     public class Transaction2SubcommandHelper
     {
diff --git a/SMBLibrary/Server/ResponseHelpers/TransactionHelper.cs b/SMBLibrary/Server/SMB1/TransactionHelper.cs
similarity index 97%
rename from SMBLibrary/Server/ResponseHelpers/TransactionHelper.cs
rename to SMBLibrary/Server/SMB1/TransactionHelper.cs
index 6457645..39345d6 100644
--- a/SMBLibrary/Server/ResponseHelpers/TransactionHelper.cs
+++ b/SMBLibrary/Server/SMB1/TransactionHelper.cs
@@ -12,7 +12,7 @@ using SMBLibrary.RPC;
 using SMBLibrary.Services;
 using Utilities;
 
-namespace SMBLibrary.Server
+namespace SMBLibrary.Server.SMB1
 {
     public class TransactionHelper
     {
diff --git a/SMBLibrary/Server/ResponseHelpers/TransactionSubcommandHelper.cs b/SMBLibrary/Server/SMB1/TransactionSubcommandHelper.cs
similarity index 95%
rename from SMBLibrary/Server/ResponseHelpers/TransactionSubcommandHelper.cs
rename to SMBLibrary/Server/SMB1/TransactionSubcommandHelper.cs
index ede9dcf..5c98f78 100644
--- a/SMBLibrary/Server/ResponseHelpers/TransactionSubcommandHelper.cs
+++ b/SMBLibrary/Server/SMB1/TransactionSubcommandHelper.cs
@@ -12,7 +12,7 @@ using SMBLibrary.SMB1;
 using SMBLibrary.Services;
 using Utilities;
 
-namespace SMBLibrary.Server
+namespace SMBLibrary.Server.SMB1
 {
     public class TransactionSubcommandHelper
     {
diff --git a/SMBLibrary/Server/ResponseHelpers/TreeConnectHelper.cs b/SMBLibrary/Server/SMB1/TreeConnectHelper.cs
similarity index 97%
rename from SMBLibrary/Server/ResponseHelpers/TreeConnectHelper.cs
rename to SMBLibrary/Server/SMB1/TreeConnectHelper.cs
index e2f5f55..b58eb34 100644
--- a/SMBLibrary/Server/ResponseHelpers/TreeConnectHelper.cs
+++ b/SMBLibrary/Server/SMB1/TreeConnectHelper.cs
@@ -10,7 +10,7 @@ using System.Text;
 using SMBLibrary.SMB1;
 using Utilities;
 
-namespace SMBLibrary.Server
+namespace SMBLibrary.Server.SMB1
 {
     public class TreeConnectHelper
     {
diff --git a/SMBLibrary/Server/SMBServer.cs b/SMBLibrary/Server/SMBServer.cs
index 03025be..96f0fc1 100644
--- a/SMBLibrary/Server/SMBServer.cs
+++ b/SMBLibrary/Server/SMBServer.cs
@@ -11,8 +11,9 @@ using System.Net;
 using System.Net.Sockets;
 using System.Text;
 using SMBLibrary.NetBios;
-using SMBLibrary.SMB1;
+using SMBLibrary.Server.SMB1;
 using SMBLibrary.Services;
+using SMBLibrary.SMB1;
 using Utilities;
 
 namespace SMBLibrary.Server