diff --git a/SMBLibrary/SMBLibrary.csproj b/SMBLibrary/SMBLibrary.csproj
index 41b2d6f..0af2317 100644
--- a/SMBLibrary/SMBLibrary.csproj
+++ b/SMBLibrary/SMBLibrary.csproj
@@ -103,6 +103,8 @@
     <Compile Include="RPC\Structures\ResultElement.cs" />
     <Compile Include="RPC\Structures\ResultList.cs" />
     <Compile Include="RPC\Structures\SyntaxID.cs" />
+    <Compile Include="Server\ConnectionState\OpenedFileObject.cs" />
+    <Compile Include="Server\ConnectionState\ProcessStateObject.cs" />
     <Compile Include="Server\ConnectionState\SMB1ConnectionState.cs" />
     <Compile Include="Server\Exceptions\EmptyPasswordNotAllowedException.cs" />
     <Compile Include="Server\Exceptions\InvalidRequestException.cs" />
@@ -112,8 +114,6 @@
     <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\Shares\FileSystemShare.cs" />
     <Compile Include="Server\Shares\ISMBShare.cs" />
     <Compile Include="Server\Shares\NamedPipeShare.cs" />
diff --git a/SMBLibrary/Server/OpenedFileObject.cs b/SMBLibrary/Server/ConnectionState/OpenedFileObject.cs
similarity index 100%
rename from SMBLibrary/Server/OpenedFileObject.cs
rename to SMBLibrary/Server/ConnectionState/OpenedFileObject.cs
diff --git a/SMBLibrary/Server/ProcessStateObject.cs b/SMBLibrary/Server/ConnectionState/ProcessStateObject.cs
similarity index 100%
rename from SMBLibrary/Server/ProcessStateObject.cs
rename to SMBLibrary/Server/ConnectionState/ProcessStateObject.cs