diff --git a/src/ClientHandler.php b/src/ClientHandler.php
index 5b32de7..c98cbc6 100644
--- a/src/ClientHandler.php
+++ b/src/ClientHandler.php
@@ -5,7 +5,6 @@ namespace LanguageServer;
 
 use AdvancedJsonRpc;
 use Sabre\Event\Promise;
-use LanguageServer\Factory\Message;
 
 class ClientHandler
 {
@@ -42,12 +41,12 @@ class ClientHandler
     {
         $id = $this->idGenerator->generate();
         return $this->protocolWriter->write(
-            new Factory\Message(
+            new Message(
                 new AdvancedJsonRpc\Request($id, $method, (object)$params)
             )
         )->then(function () use ($id) {
             $promise = new Promise;
-            $listener = function (Factory\Message $msg) use ($id, $promise, &$listener) {
+            $listener = function (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 +72,7 @@ class ClientHandler
     public function notify(string $method, $params): Promise
     {
         return $this->protocolWriter->write(
-            new Factory\Message(
+            new Message(
                 new AdvancedJsonRpc\Notification($method, (object)$params)
             )
         );
diff --git a/src/LanguageServer.php b/src/LanguageServer.php
index 54a712e..c023e33 100644
--- a/src/LanguageServer.php
+++ b/src/LanguageServer.php
@@ -11,7 +11,7 @@ use LanguageServer\Protocol\{
     CompletionOptions,
     SignatureHelpOptions
 };
-use LanguageServer\Factory\Message;
+use LanguageServer\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/Factory/Message.php b/src/Message.php
similarity index 95%
rename from src/Factory/Message.php
rename to src/Message.php
index ce5a2a4..fb51110 100644
--- a/src/Factory/Message.php
+++ b/src/Message.php
@@ -1,10 +1,10 @@
 <?php
 declare(strict_types = 1);
 
-namespace LanguageServer\Factory;
+namespace LanguageServer;
 
 use AdvancedJsonRpc\Message as MessageBody;
-use LanguageServer\Factory\Message;
+use LanguageServer\Message;
 
 class Message
 {
diff --git a/src/ProtocolStreamReader.php b/src/ProtocolStreamReader.php
index 91e67aa..ecb4ae1 100644
--- a/src/ProtocolStreamReader.php
+++ b/src/ProtocolStreamReader.php
@@ -3,7 +3,7 @@ declare(strict_types = 1);
 
 namespace LanguageServer;
 
-use LanguageServer\Factory\Message;
+use LanguageServer\Message;
 use AdvancedJsonRpc\Message as MessageBody;
 use Sabre\Event\{Loop, Emitter};
 
diff --git a/src/ProtocolStreamWriter.php b/src/ProtocolStreamWriter.php
index ec0ab8f..166ea90 100644
--- a/src/ProtocolStreamWriter.php
+++ b/src/ProtocolStreamWriter.php
@@ -3,7 +3,7 @@ declare(strict_types = 1);
 
 namespace LanguageServer;
 
-use LanguageServer\Factory\Message;
+use LanguageServer\Message;
 use Sabre\Event\{
     Loop,
     Promise
diff --git a/src/ProtocolWriter.php b/src/ProtocolWriter.php
index e641f75..ac25218 100644
--- a/src/ProtocolWriter.php
+++ b/src/ProtocolWriter.php
@@ -3,7 +3,7 @@ declare(strict_types = 1);
 
 namespace LanguageServer;
 
-use LanguageServer\Factory\Message;
+use LanguageServer\Message;
 use Sabre\Event\Promise;
 
 interface ProtocolWriter
diff --git a/tests/ClientHandlerTest.php b/tests/ClientHandlerTest.php
index 3ecdf6a..19114d9 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\Factory\Message;
+use LanguageServer\Message;
 use AdvancedJsonRpc;
 use Sabre\Event\Loop;
 
diff --git a/tests/LanguageServerTest.php b/tests/LanguageServerTest.php
index b77806f..f4484a0 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\Factory\Message;
+use LanguageServer\Message;
 use LanguageServer\Protocol\{
     ClientCapabilities,
     TextDocumentSyncKind,
diff --git a/tests/MockProtocolStream.php b/tests/MockProtocolStream.php
index bc0dd77..9287053 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\Factory\Message;
+use LanguageServer\Message;
 use Sabre\Event\{Loop, Emitter, Promise};
 
 /**
diff --git a/tests/ProtocolStreamReaderTest.php b/tests/ProtocolStreamReaderTest.php
index 7641de3..a0dcad5 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\Factory\Message;
+use LanguageServer\Message;
 use AdvancedJsonRpc\{Request as RequestBody, Response as ResponseBody};
 use Sabre\Event\Loop;
 
diff --git a/tests/ProtocolStreamWriterTest.php b/tests/ProtocolStreamWriterTest.php
index 2e6af54..8ac94e7 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\Factory\Message;
+use LanguageServer\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 5564d2e..ff40e0b 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\Factory\Message;
+use LanguageServer\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 0953db3..04f7540 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\Factory\Message;
+use LanguageServer\Message;
 use AdvancedJsonRpc;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;