diff --git a/src/ClientHandler.php b/src/ClientHandler.php
index 23ffc94..5b32de7 100644
--- a/src/ClientHandler.php
+++ b/src/ClientHandler.php
@@ -5,7 +5,7 @@ namespace LanguageServer;
 
 use AdvancedJsonRpc;
 use Sabre\Event\Promise;
-use LanguageServer\ProtocolBridge\Message;
+use LanguageServer\Factory\Message;
 
 class ClientHandler
 {
@@ -42,12 +42,12 @@ class ClientHandler
     {
         $id = $this->idGenerator->generate();
         return $this->protocolWriter->write(
-            new ProtocolBridge\Message(
+            new Factory\Message(
                 new AdvancedJsonRpc\Request($id, $method, (object)$params)
             )
         )->then(function () use ($id) {
             $promise = new Promise;
-            $listener = function (ProtocolBridge\Message $msg) use ($id, $promise, &$listener) {
+            $listener = function (Factory\Message $msg) use ($id, $promise, &$listener) {
                 if (AdvancedJsonRpc\Response::isResponse($msg->body) && $msg->body->id === $id) {
                     // Received a response
                     $this->protocolReader->removeListener('message', $listener);
@@ -73,7 +73,7 @@ class ClientHandler
     public function notify(string $method, $params): Promise
     {
         return $this->protocolWriter->write(
-            new ProtocolBridge\Message(
+            new Factory\Message(
                 new AdvancedJsonRpc\Notification($method, (object)$params)
             )
         );
diff --git a/src/CompletionProvider.php b/src/CompletionProvider.php
index f330697..22f0a9d 100644
--- a/src/CompletionProvider.php
+++ b/src/CompletionProvider.php
@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer;
 
 use LanguageServer\Index\ReadableIndex;
-use LanguageServer\ProtocolBridge\CompletionItemFactory;
+use LanguageServer\Factory\CompletionItemFactory;
 use LanguageServer\Protocol\{
     TextEdit,
     Range,
diff --git a/src/DefinitionResolver.php b/src/DefinitionResolver.php
index 6d87cae..eeb4199 100644
--- a/src/DefinitionResolver.php
+++ b/src/DefinitionResolver.php
@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer;
 
 use LanguageServer\Index\ReadableIndex;
-use LanguageServer\ProtocolBridge\SymbolInformationFactory;
+use LanguageServer\Factory\SymbolInformationFactory;
 use LanguageServer\Protocol\SymbolInformation;
 use Microsoft\PhpParser;
 use Microsoft\PhpParser\Node;
diff --git a/src/ProtocolBridge/CompletionItemFactory.php b/src/Factory/CompletionItemFactory.php
similarity index 96%
rename from src/ProtocolBridge/CompletionItemFactory.php
rename to src/Factory/CompletionItemFactory.php
index f3a3103..9e77cba 100644
--- a/src/ProtocolBridge/CompletionItemFactory.php
+++ b/src/Factory/CompletionItemFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace LanguageServer\ProtocolBridge;
+namespace LanguageServer\Factory;
 
 use LanguageServer\Definition;
 use LanguageServer\Protocol\CompletionItem;
diff --git a/src/ProtocolBridge/LocationFactory.php b/src/Factory/LocationFactory.php
similarity index 94%
rename from src/ProtocolBridge/LocationFactory.php
rename to src/Factory/LocationFactory.php
index df99adf..7f2da4c 100644
--- a/src/ProtocolBridge/LocationFactory.php
+++ b/src/Factory/LocationFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace LanguageServer\ProtocolBridge;
+namespace LanguageServer\Factory;
 
 use LanguageServer\Protocol\Location;
 use LanguageServer\Protocol\Position;
diff --git a/src/ProtocolBridge/Message.php b/src/Factory/Message.php
similarity index 94%
rename from src/ProtocolBridge/Message.php
rename to src/Factory/Message.php
index dd1f3e0..ce5a2a4 100644
--- a/src/ProtocolBridge/Message.php
+++ b/src/Factory/Message.php
@@ -1,10 +1,10 @@
 <?php
 declare(strict_types = 1);
 
-namespace LanguageServer\ProtocolBridge;
+namespace LanguageServer\Factory;
 
 use AdvancedJsonRpc\Message as MessageBody;
-use LanguageServer\ProtocolBridge\Message;
+use LanguageServer\Factory\Message;
 
 class Message
 {
diff --git a/src/ProtocolBridge/RangeFactory.php b/src/Factory/RangeFactory.php
similarity index 94%
rename from src/ProtocolBridge/RangeFactory.php
rename to src/Factory/RangeFactory.php
index 011bf4b..fdce13f 100644
--- a/src/ProtocolBridge/RangeFactory.php
+++ b/src/Factory/RangeFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace LanguageServer\ProtocolBridge;
+namespace LanguageServer\Factory;
 
 use LanguageServer\Protocol\Position;
 use LanguageServer\Protocol\Range;
diff --git a/src/ProtocolBridge/SymbolInformationFactory.php b/src/Factory/SymbolInformationFactory.php
similarity index 98%
rename from src/ProtocolBridge/SymbolInformationFactory.php
rename to src/Factory/SymbolInformationFactory.php
index 41dad3c..83bc504 100644
--- a/src/ProtocolBridge/SymbolInformationFactory.php
+++ b/src/Factory/SymbolInformationFactory.php
@@ -1,12 +1,13 @@
 <?php
 
-namespace LanguageServer\ProtocolBridge;
+namespace LanguageServer\Factory;
 
 use LanguageServer\Protocol\Location;
 use LanguageServer\Protocol\SymbolInformation;
 use LanguageServer\Protocol\SymbolKind;
 use Microsoft\PhpParser\Node;
 use Microsoft\PhpParser\ResolvedName;
+use LanguageServer\Factory\LocationFactory;
 
 class SymbolInformationFactory
 {
diff --git a/src/LanguageServer.php b/src/LanguageServer.php
index c456831..54a712e 100644
--- a/src/LanguageServer.php
+++ b/src/LanguageServer.php
@@ -11,7 +11,7 @@ use LanguageServer\Protocol\{
     CompletionOptions,
     SignatureHelpOptions
 };
-use LanguageServer\ProtocolBridge\Message;
+use LanguageServer\Factory\Message;
 use LanguageServer\FilesFinder\{FilesFinder, ClientFilesFinder, FileSystemFilesFinder};
 use LanguageServer\ContentRetriever\{ContentRetriever, ClientContentRetriever, FileSystemContentRetriever};
 use LanguageServer\Index\{DependenciesIndex, GlobalIndex, Index, ProjectIndex, StubsIndex};
diff --git a/src/Protocol/SymbolInformation.php b/src/Protocol/SymbolInformation.php
index 3070c28..6ad560c 100644
--- a/src/Protocol/SymbolInformation.php
+++ b/src/Protocol/SymbolInformation.php
@@ -2,7 +2,7 @@
 
 namespace LanguageServer\Protocol;
 
-use LanguageServer\ProtocolBridge\LocationFactory;
+use LanguageServer\Factory\LocationFactory;
 use Microsoft\PhpParser;
 use Microsoft\PhpParser\Node;
 
diff --git a/src/ProtocolStreamReader.php b/src/ProtocolStreamReader.php
index 4d98087..91e67aa 100644
--- a/src/ProtocolStreamReader.php
+++ b/src/ProtocolStreamReader.php
@@ -3,7 +3,7 @@ declare(strict_types = 1);
 
 namespace LanguageServer;
 
-use LanguageServer\ProtocolBridge\Message;
+use LanguageServer\Factory\Message;
 use AdvancedJsonRpc\Message as MessageBody;
 use Sabre\Event\{Loop, Emitter};
 
diff --git a/src/ProtocolStreamWriter.php b/src/ProtocolStreamWriter.php
index f202ea0..ec0ab8f 100644
--- a/src/ProtocolStreamWriter.php
+++ b/src/ProtocolStreamWriter.php
@@ -3,7 +3,7 @@ declare(strict_types = 1);
 
 namespace LanguageServer;
 
-use LanguageServer\ProtocolBridge\Message;
+use LanguageServer\Factory\Message;
 use Sabre\Event\{
     Loop,
     Promise
diff --git a/src/ProtocolWriter.php b/src/ProtocolWriter.php
index dd2da72..e641f75 100644
--- a/src/ProtocolWriter.php
+++ b/src/ProtocolWriter.php
@@ -3,7 +3,7 @@ declare(strict_types = 1);
 
 namespace LanguageServer;
 
-use LanguageServer\ProtocolBridge\Message;
+use LanguageServer\Factory\Message;
 use Sabre\Event\Promise;
 
 interface ProtocolWriter
diff --git a/src/Server/TextDocument.php b/src/Server/TextDocument.php
index 8aaca57..a9ddced 100644
--- a/src/Server/TextDocument.php
+++ b/src/Server/TextDocument.php
@@ -7,8 +7,8 @@ use LanguageServer\{
     CompletionProvider, SignatureHelpProvider, LanguageClient, PhpDocument, PhpDocumentLoader, DefinitionResolver
 };
 use LanguageServer\Index\ReadableIndex;
-use LanguageServer\ProtocolBridge\LocationFactory;
-use LanguageServer\ProtocolBridge\RangeFactory;
+use LanguageServer\Factory\LocationFactory;
+use LanguageServer\Factory\RangeFactory;
 use LanguageServer\Protocol\{
     FormattingOptions,
     Hover,
diff --git a/src/Server/Workspace.php b/src/Server/Workspace.php
index 37bbfe3..b3fee63 100644
--- a/src/Server/Workspace.php
+++ b/src/Server/Workspace.php
@@ -5,7 +5,7 @@ namespace LanguageServer\Server;
 
 use LanguageServer\{LanguageClient, PhpDocumentLoader};
 use LanguageServer\Index\{ProjectIndex, DependenciesIndex, Index};
-use LanguageServer\ProtocolBridge\LocationFactory;
+use LanguageServer\Factory\LocationFactory;
 use LanguageServer\Protocol\{
     FileChangeType,
     FileEvent,
diff --git a/src/TreeAnalyzer.php b/src/TreeAnalyzer.php
index fbb5bb7..d9687a0 100644
--- a/src/TreeAnalyzer.php
+++ b/src/TreeAnalyzer.php
@@ -3,7 +3,7 @@ declare(strict_types = 1);
 
 namespace LanguageServer;
 
-use LanguageServer\ProtocolBridge\RangeFactory;
+use LanguageServer\Factory\RangeFactory;
 use LanguageServer\Protocol\{Diagnostic, DiagnosticSeverity, Range, Position};
 use phpDocumentor\Reflection\DocBlockFactory;
 use Microsoft\PhpParser;
diff --git a/tests/ClientHandlerTest.php b/tests/ClientHandlerTest.php
index 3a4106f..3ecdf6a 100644
--- a/tests/ClientHandlerTest.php
+++ b/tests/ClientHandlerTest.php
@@ -5,7 +5,7 @@ namespace LanguageServer\Tests;
 
 use PHPUnit\Framework\TestCase;
 use LanguageServer\ClientHandler;
-use LanguageServer\ProtocolBridge\Message;
+use LanguageServer\Factory\Message;
 use AdvancedJsonRpc;
 use Sabre\Event\Loop;
 
diff --git a/tests/LanguageServerTest.php b/tests/LanguageServerTest.php
index 8aebf77..b77806f 100644
--- a/tests/LanguageServerTest.php
+++ b/tests/LanguageServerTest.php
@@ -5,7 +5,7 @@ namespace LanguageServer\Tests;
 
 use PHPUnit\Framework\TestCase;
 use LanguageServer\LanguageServer;
-use LanguageServer\ProtocolBridge\Message;
+use LanguageServer\Factory\Message;
 use LanguageServer\Protocol\{
     ClientCapabilities,
     TextDocumentSyncKind,
diff --git a/tests/MockProtocolStream.php b/tests/MockProtocolStream.php
index 92462cd..bc0dd77 100644
--- a/tests/MockProtocolStream.php
+++ b/tests/MockProtocolStream.php
@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer\Tests;
 
 use LanguageServer\{ProtocolReader, ProtocolWriter};
-use LanguageServer\ProtocolBridge\Message;
+use LanguageServer\Factory\Message;
 use Sabre\Event\{Loop, Emitter, Promise};
 
 /**
diff --git a/tests/ProtocolStreamReaderTest.php b/tests/ProtocolStreamReaderTest.php
index e18b650..7641de3 100644
--- a/tests/ProtocolStreamReaderTest.php
+++ b/tests/ProtocolStreamReaderTest.php
@@ -5,7 +5,7 @@ namespace LanguageServer\Tests;
 
 use PHPUnit\Framework\TestCase;
 use LanguageServer\{LanguageServer, ProtocolStreamReader, ProtocolStreamWriter};
-use LanguageServer\ProtocolBridge\Message;
+use LanguageServer\Factory\Message;
 use AdvancedJsonRpc\{Request as RequestBody, Response as ResponseBody};
 use Sabre\Event\Loop;
 
diff --git a/tests/ProtocolStreamWriterTest.php b/tests/ProtocolStreamWriterTest.php
index 331a246..2e6af54 100644
--- a/tests/ProtocolStreamWriterTest.php
+++ b/tests/ProtocolStreamWriterTest.php
@@ -5,7 +5,7 @@ namespace LanguageServer\Tests;
 
 use PHPUnit\Framework\TestCase;
 use LanguageServer\ProtocolStreamWriter;
-use LanguageServer\ProtocolBridge\Message;
+use LanguageServer\Factory\Message;
 use AdvancedJsonRpc\{Request as RequestBody};
 use Sabre\Event\Loop;
 
diff --git a/tests/Server/Workspace/DidChangeWatchedFilesTest.php b/tests/Server/Workspace/DidChangeWatchedFilesTest.php
index 31e2fc5..5564d2e 100644
--- a/tests/Server/Workspace/DidChangeWatchedFilesTest.php
+++ b/tests/Server/Workspace/DidChangeWatchedFilesTest.php
@@ -7,7 +7,7 @@ use LanguageServer\ContentRetriever\FileSystemContentRetriever;
 use LanguageServer\{DefinitionResolver, LanguageClient, PhpDocumentLoader, Server};
 use LanguageServer\Index\{DependenciesIndex, Index, ProjectIndex};
 use LanguageServer\Protocol\{FileChangeType, FileEvent};
-use LanguageServer\ProtocolBridge\Message;
+use LanguageServer\Factory\Message;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\Tests\Server\ServerTestCase;
 use LanguageServer\Server\Workspace;
diff --git a/tests/Validation/ValidationTest.php b/tests/Validation/ValidationTest.php
index 288fffc..0953db3 100644
--- a/tests/Validation/ValidationTest.php
+++ b/tests/Validation/ValidationTest.php
@@ -13,7 +13,7 @@ use phpDocumentor\Reflection\DocBlock;
 use phpDocumentor\Reflection\DocBlockFactory;
 use PHPUnit\Framework\TestCase;
 use LanguageServer\ClientHandler;
-use LanguageServer\ProtocolBridge\Message;
+use LanguageServer\Factory\Message;
 use AdvancedJsonRpc;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;