diff --git a/README.md b/README.md
new file mode 100644
index 0000000..8544ca8
--- /dev/null
+++ b/README.md
@@ -0,0 +1,5 @@
+# PHP Language Server
+> A pure PHP implementation of the [Language Server Protocol](https://github.com/Microsoft/language-server-protocol).
+
+[![Version](https://img.shields.io/packagist/v/felixfbecker/language-server.svg)]() [![License](https://img.shields.io/packagist/l/felixfbecker/language-server.svg)]()
+
diff --git a/src/Protocol/LanguageServer.php b/src/LanguageServer.php
similarity index 100%
rename from src/Protocol/LanguageServer.php
rename to src/LanguageServer.php
diff --git a/src/Protocol/CodeActionContext.php b/src/Protocol/CodeActionContext.php
new file mode 100644
index 0000000..88e2e04
--- /dev/null
+++ b/src/Protocol/CodeActionContext.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+/**
+ * Contains additional diagnostic information about the context in which
+ * a code action is run.
+ */
+class CodeActionContext
+{
+    /**
+     * An array of diagnostics.
+     *
+     * @var Diagnostic[]
+     */
+    public $diagnostics;
+}
diff --git a/src/Protocol/CodeLens.php b/src/Protocol/CodeLens.php
new file mode 100644
index 0000000..557cf9c
--- /dev/null
+++ b/src/Protocol/CodeLens.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+/**
+ * A code lens represents a command that should be shown along with
+ * source text, like the number of references, a way to run tests, etc.
+ *
+ * A code lens is _unresolved_ when no command is associated to it. For performance
+ * reasons the creation of a code lens and resolving should be done in two stages.
+ */
+class CodeLens
+{
+    /**
+     * The range in which this code lens is valid. Should only span a single line.
+     *
+     * @var Range
+     */
+    public $range;
+
+    /**
+     * The command this code lens represents.
+     *
+     * @var Command|null
+     */
+    public $command;
+
+    /**
+     * A data entry field that is preserved on a code lens item between
+     * a code lens and a code lens resolve request.
+     *
+     * @var mixed|null
+     */
+    public $data;
+}
diff --git a/src/Protocol/ServerCapabilities/CodeLensOptions.php b/src/Protocol/CodeLensOptions.php
similarity index 71%
rename from src/Protocol/ServerCapabilities/CodeLensOptions.php
rename to src/Protocol/CodeLensOptions.php
index 6dd9019..bd6548d 100644
--- a/src/Protocol/ServerCapabilities/CodeLensOptions.php
+++ b/src/Protocol/CodeLensOptions.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace LanguageServer\Protocol\Methods\Initialize\ServerCapabilities;
+namespace LanguageServer\Protocol;
 
 /**
  * Code Lens options.
diff --git a/src/Protocol/Command.php b/src/Protocol/Command.php
new file mode 100644
index 0000000..27d5a7e
--- /dev/null
+++ b/src/Protocol/Command.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+/**
+ * Represents a reference to a command. Provides a title which will be used to represent a command in the UI and,
+ * optionally, an array of arguments which will be passed to the command handler function when invoked.
+ */
+class Command
+{
+    /**
+     * Title of the command, like `save`.
+     *
+     * @var string
+     */
+    public $title;
+
+    /**
+     * The identifier of the actual command handler.
+     *
+     * @var string
+     */
+    public $command;
+
+    /**
+     * Arguments that the command handler should be
+     * invoked with.
+     *
+     * @var mixed[]|null
+     */
+    public $arguments;
+}
diff --git a/src/Protocol/CompletionItem.php b/src/Protocol/CompletionItem.php
index 6c68644..780f31f 100644
--- a/src/Protocol/CompletionItem.php
+++ b/src/Protocol/CompletionItem.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace LanguageServer\Protocol\TextDocument;
+namespace LanguageServer\Protocol;
 
 class CompletionItem
 {
@@ -17,7 +17,7 @@ class CompletionItem
      * The kind of this completion item. Based of the kind
      * an icon is chosen by the editor.
      *
-     * @var number|null
+     * @var int|null
      */
     public $kind;
 
diff --git a/src/Protocol/CompletionKind.php b/src/Protocol/CompletionKind.php
index 7121760..9a2bd15 100644
--- a/src/Protocol/CompletionKind.php
+++ b/src/Protocol/CompletionKind.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace LanguageServer\Protocol\TextDocument;
+namespace LanguageServer\Protocol;
 
 /**
  * The kind of a completion entry.
@@ -8,12 +8,12 @@ namespace LanguageServer\Protocol\TextDocument;
 abstract class CompletionItemKind {
     const TEXT = 1;
     const METHOD = 2;
-    const _FUNCTION = 3;
+    const FUNCTION = 3;
     const CONSTRUCTOR = 4;
     const FIELD = 5;
     const VARIABLE = 6;
     const _CLASS = 7;
-    const _INTERFACE = 8;
+    const INTERFACE = 8;
     const MODULE = 9;
     const PROPERTY = 10;
     const UNIT = 11;
diff --git a/src/Protocol/CompletionList.php b/src/Protocol/CompletionList.php
index a725144..d348830 100644
--- a/src/Protocol/CompletionList.php
+++ b/src/Protocol/CompletionList.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace LanguageServer\Protocol\TextDocument;
+namespace LanguageServer\Protocol;
 
 /**
- * Represents a collection of [completion items](#CompletionItem) to be presented in
+ * Represents a collection of completion items to be presented in
  * the editor.
  */
 class CompletionList
diff --git a/src/Protocol/ServerCapabilities/CompletionOptions.php b/src/Protocol/CompletionOptions.php
similarity index 83%
rename from src/Protocol/ServerCapabilities/CompletionOptions.php
rename to src/Protocol/CompletionOptions.php
index 7fd10a1..0be727e 100644
--- a/src/Protocol/ServerCapabilities/CompletionOptions.php
+++ b/src/Protocol/CompletionOptions.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace LanguageServer\Protocol\Methods\Initialize\ServerCapabilities;
+namespace LanguageServer\Protocol;
 
 /**
  * Completion options.
diff --git a/src/Protocol/ContentChangeEvent.php b/src/Protocol/ContentChangeEvent.php
index 2d99a27..ec48bab 100644
--- a/src/Protocol/ContentChangeEvent.php
+++ b/src/Protocol/ContentChangeEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace LanguageServer\Protocol\TextDocument;
+namespace LanguageServer\Protocol;
 
 /**
  * An event describing a change to a text document. If range and rangeLength are
@@ -8,7 +8,6 @@ namespace LanguageServer\Protocol\TextDocument;
  */
 class ContentChangeEvent
 {
-
     /**
      * The range of the document that changed.
      *
diff --git a/src/Protocol/Diagnostic.php b/src/Protocol/Diagnostic.php
new file mode 100644
index 0000000..b65f288
--- /dev/null
+++ b/src/Protocol/Diagnostic.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+/**
+ * Represents a diagnostic, such as a compiler error or warning. Diagnostic objects are only valid in the scope of a
+ * resource.
+ */
+class Diagnostic
+{
+    /**
+     * The range at which the message applies.
+     *
+     * @var Range
+     */
+    public $range;
+
+    /**
+     * The diagnostic's severity. Can be omitted. If omitted it is up to the
+     * client to interpret diagnostics as error, warning, info or hint.
+     *
+     * @var int|null
+     */
+    public $severity;
+
+    /**
+     * The diagnostic's code. Can be omitted.
+     *
+     * @var int|string|null
+     */
+    public $code;
+
+    /**
+     * A human-readable string describing the source of this
+     * diagnostic, e.g. 'typescript' or 'super lint'.
+     *
+     * @var string|null
+     */
+    public $source;
+
+    /**
+     * The diagnostic's message.
+     *
+     * @var string
+     */
+    public $message;
+}
diff --git a/src/Protocol/DiagnosticSeverity.php b/src/Protocol/DiagnosticSeverity.php
new file mode 100644
index 0000000..e91da8f
--- /dev/null
+++ b/src/Protocol/DiagnosticSeverity.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+abstract class DiagnosticSeverity
+{
+    /**
+     * Reports an error.
+     */
+    const ERROR = 1;
+
+    /**
+     * Reports a warning.
+     */
+    const WARNING = 2;
+
+    /**
+     * Reports an information.
+     */
+    const INFORMATION = 3;
+
+    /**
+     * Reports a hint.
+     */
+    const HINT = 4;
+}
diff --git a/src/Protocol/DocumentHighlight.php b/src/Protocol/DocumentHighlight.php
new file mode 100644
index 0000000..e00c842
--- /dev/null
+++ b/src/Protocol/DocumentHighlight.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+/**
+ * A document highlight is a range inside a text document which deserves
+ * special attention. Usually a document highlight is visualized by changing
+ * the background color of its range.
+ */
+class DocumentHighlightKind
+{
+    /**
+     * The range this highlight applies to.
+     *
+     * @var Range
+     */
+    public $range;
+
+    /**
+     * The highlight kind, default is DocumentHighlightKind::TEXT.
+     *
+     * @var int|null
+     */
+    public $kind;
+}
diff --git a/src/Protocol/DocumentHighlightKind.php b/src/Protocol/DocumentHighlightKind.php
new file mode 100644
index 0000000..14e701a
--- /dev/null
+++ b/src/Protocol/DocumentHighlightKind.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+/**
+ * A document highlight kind.
+ */
+abstract class DocumentHighlightKind
+{
+    /**
+     * A textual occurrance.
+     */
+    const TEXT = 1;
+
+    /**
+     * Read-access of a symbol, like reading a variable.
+     */
+    const READ = 2;
+
+    /**
+     * Write-access of a symbol, like writing to a variable.
+     */
+    const WRITE = 3;
+}
diff --git a/src/Protocol/ServerCapabilities/DocumentOnTypeFormattingOptions.php b/src/Protocol/DocumentOnTypeFormattingOptions.php
similarity index 82%
rename from src/Protocol/ServerCapabilities/DocumentOnTypeFormattingOptions.php
rename to src/Protocol/DocumentOnTypeFormattingOptions.php
index f726266..875da9c 100644
--- a/src/Protocol/ServerCapabilities/DocumentOnTypeFormattingOptions.php
+++ b/src/Protocol/DocumentOnTypeFormattingOptions.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace LanguageServer\Protocol\Methods\Initialize\ServerCapabilities;
+namespace LanguageServer\Protocol;
 
 /**
  * Format document on type options
diff --git a/src/Protocol/ErrorCode.php b/src/Protocol/ErrorCode.php
index d667fec..51d88c7 100644
--- a/src/Protocol/ErrorCode.php
+++ b/src/Protocol/ErrorCode.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LanguageServer\Protocol;
+
 /**
  * Enum
  */
diff --git a/src/Protocol/FileEvent.php b/src/Protocol/FileEvent.php
index cff008b..b4ed833 100644
--- a/src/Protocol/FileEvent.php
+++ b/src/Protocol/FileEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace LanguageServer\Protocol\TextDocument;
+namespace LanguageServer\Protocol;
 
 /**
  * An event describing a file change.
diff --git a/src/Protocol/FormattingOptions.php b/src/Protocol/FormattingOptions.php
new file mode 100644
index 0000000..b672ddf
--- /dev/null
+++ b/src/Protocol/FormattingOptions.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+/**
+ * Value-object describing what options formatting should use.
+ */
+class FormattingOptions
+{
+    /**
+     * Size of a tab in spaces.
+     *
+     * @var int
+     */
+    public $tabSize;
+
+    /**
+     * Prefer spaces over tabs.
+     *
+     * @var bool
+     */
+    public $insertSpaces;
+
+    // Can be extended with further properties.
+}
diff --git a/src/Protocol/Location.php b/src/Protocol/Location.php
new file mode 100644
index 0000000..9766496
--- /dev/null
+++ b/src/Protocol/Location.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+/**
+ * Represents a location inside a resource, such as a line inside a text file.
+ */
+class Location
+{
+    /**
+     * @var string
+     */
+    public $uri;
+
+    /**
+     * @var Range
+     */
+    public $range;
+}
diff --git a/src/Protocol/Message.php b/src/Protocol/Message.php
index e043c49..da5ad05 100644
--- a/src/Protocol/Message.php
+++ b/src/Protocol/Message.php
@@ -1,5 +1,10 @@
 <?php
 
+namespace LanguageServer\Protocol;
+
+/**
+ * A general message as defined by JSON-RPC. The language server protocol always uses "2.0" as the jsonrpc version.
+ */
 abstract class Message
 {
     /**
@@ -8,4 +13,37 @@ abstract class Message
      * @var string
      */
     public $jsonrpc;
+
+    /**
+     * Parses a request body and returns the appropiate Message subclass
+     *
+     * @param string $body The raw request body
+     * @param string $fallbackClass The class to fall back to if the body is not a Notification and the method is
+     * unknown (Request::class or Response::class)
+     */
+    public static function parse(string $body, string $fallbackClass): self
+    {
+        $decoded = json_decode($body);
+
+        // The appropiate Request/Notification subclasses are namespaced according to the method
+        // example: textDocument/didOpen -> LanguageServer\Protocol\Methods\TextDocument\DidOpenNotification
+        $class = __NAMESPACE__ . '\\Methods\\' . implode('\\', array_map('ucfirst', explode('/', $decoded->method))) . (isset($decoded->id) ? 'Request' : 'Notification');
+
+        // If the Request/Notification type is unknown, instantiate a basic Request or Notification class
+        // (this is the reason Request and Notification are not abstract)
+        if (!class_exists($class)) {
+            fwrite(STDERR, "Unknown method {$decoded->method}\n");
+            if (!isset($decoded->id)) {
+                $class = Notification::class;
+            } else {
+                $class = $fallbackClass;
+            }
+        }
+
+        // JsonMapper will take care of recursively using the right classes for $params etc.
+        $mapper = new JsonMapper();
+        $message = $mapper->map($decoded, new $class);
+
+        return $message;
+    }
 }
diff --git a/src/Protocol/Methods/Window/MessageActionItem.php b/src/Protocol/MessageActionItem.php
similarity index 65%
rename from src/Protocol/Methods/Window/MessageActionItem.php
rename to src/Protocol/MessageActionItem.php
index 3dd276a..59dafe5 100644
--- a/src/Protocol/Methods/Window/MessageActionItem.php
+++ b/src/Protocol/MessageActionItem.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace LanguageServer\Protocol\Window;
+namespace LanguageServer\Protocol;
 
-class ShowMessageParams
+class MessageActionItem
 {
     /**
      * A short title like 'Retry', 'Open Log' etc.
diff --git a/src/Protocol/Methods/Window/MessageType.php b/src/Protocol/MessageType.php
similarity index 89%
rename from src/Protocol/Methods/Window/MessageType.php
rename to src/Protocol/MessageType.php
index a7d8195..6def9e9 100644
--- a/src/Protocol/Methods/Window/MessageType.php
+++ b/src/Protocol/MessageType.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LanguageServer\Protocol;
+
 /**
  * Enum
  */
diff --git a/src/Protocol/Methods/$/CancelRequestNotification.php b/src/Protocol/Methods/$/CancelRequestNotification.php
new file mode 100644
index 0000000..3c6a9b7
--- /dev/null
+++ b/src/Protocol/Methods/$/CancelRequestNotification.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods;
+
+use LanguageServer\Protocol\Notification;
+
+class CancelRequestNotification extends Notification
+{
+    /**
+     * @var CancelParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/$/CancelRequestParams.php b/src/Protocol/Methods/$/CancelRequestParams.php
new file mode 100644
index 0000000..fa32993
--- /dev/null
+++ b/src/Protocol/Methods/$/CancelRequestParams.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods;
+
+use LanguageServer\Protocol\Params;
+
+class CancelRequestParams extends Params
+{
+	/**
+	 * The request id to cancel.
+     *
+     * @var int|string
+	 */
+	public $id;
+}
diff --git a/src/Protocol/Methods/CodeLens/ResolveRequest.php b/src/Protocol/Methods/CodeLens/ResolveRequest.php
new file mode 100644
index 0000000..f558069
--- /dev/null
+++ b/src/Protocol/Methods/CodeLens/ResolveRequest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\CodeLens;
+
+use LanguageServer\Protocol\Request;
+
+/**
+ * The code lens resolve request is sent from the client to the server to resolve the command for a given code lens
+ * item.
+ */
+class ResolveRequest extends Request
+{
+    /**
+     * @var LanguageServer\Protocol\CodeLens
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/CodeLens/ResolveResponse.php b/src/Protocol/Methods/CodeLens/ResolveResponse.php
new file mode 100644
index 0000000..6d944bb
--- /dev/null
+++ b/src/Protocol/Methods/CodeLens/ResolveResponse.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\CodeLens;
+
+use LanguageServer\Protocol\Response;
+
+class ResolveResponse extends Response
+{
+    /**
+     * @var LanguageServer\Protocol\CodeLens
+     */
+    public $result;
+}
diff --git a/src/Protocol/Methods/CompletionItem/ResolveRequest.php b/src/Protocol/Methods/CompletionItem/ResolveRequest.php
index 0143bd6..dc172e1 100644
--- a/src/Protocol/Methods/CompletionItem/ResolveRequest.php
+++ b/src/Protocol/Methods/CompletionItem/ResolveRequest.php
@@ -1,15 +1,17 @@
 <?php
 
-namespace LanguageServer\Protocol\Methods\CompletionItem\ResolveRequest;
+namespace LanguageServer\Protocol\Methods\CompletionItem;
+
+use LanguageServer\Protocol\Request;
 
 /**
  * The request is sent from the client to the server to resolve additional
  * information for a given completion item.
  */
-class CompletionItemResolveRequest
+class ResolveRequest extends Request
 {
     /**
-     * @var CompletionItem
+     * @var LanguageServer\Protocol\CompletionItem
      */
     public $params;
 }
diff --git a/src/Protocol/Methods/CompletionItem/ResolveResponse.php b/src/Protocol/Methods/CompletionItem/ResolveResponse.php
new file mode 100644
index 0000000..53cc131
--- /dev/null
+++ b/src/Protocol/Methods/CompletionItem/ResolveResponse.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\CompletionItem;
+
+use LanguageServer\Protocol\Response;
+
+class ResolveResponse extends Response
+{
+    /**
+     * @var LanguageServer\Protocol\CompletionItem
+     */
+    public $result;
+}
diff --git a/src/Protocol/Methods/ExitNotification.php b/src/Protocol/Methods/ExitNotification.php
new file mode 100644
index 0000000..a3e9d0c
--- /dev/null
+++ b/src/Protocol/Methods/ExitNotification.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods;
+
+use LanguageServer\Protocol\Notification;
+
+/**
+ * A notification to ask the server to exit its process.
+ */
+class ExitNotification extends Notification
+{
+    /**
+     * @var null
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/Initialize/InitializeParams.php b/src/Protocol/Methods/Initialize/InitializeParams.php
index 9c0e899..ea725b3 100644
--- a/src/Protocol/Methods/Initialize/InitializeParams.php
+++ b/src/Protocol/Methods/Initialize/InitializeParams.php
@@ -15,7 +15,7 @@ class InitializeParams
     /**
      * The process Id of the parent process that started the server.
      *
-     * @var number
+     * @var int
      */
     public $processId;
 
diff --git a/src/Protocol/Methods/Initialize/InitializeRequest.php b/src/Protocol/Methods/Initialize/InitializeRequest.php
index 905dfd9..3fcad9a 100644
--- a/src/Protocol/Methods/Initialize/InitializeRequest.php
+++ b/src/Protocol/Methods/Initialize/InitializeRequest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace LanguageServer\Protocol\Methods\InitializeRequest;
+namespace LanguageServer\Protocol\Methods\Initialize;
 
-/*
+use LanguageServer\Protocol\Request;
+
+/**
  * The initialize request is sent as the first request from the client to the server.
  */
-class CompletionItemResolveRequest
+class InitializeRequest extends Request
 {
     /**
      * @var InitializeParams
diff --git a/src/Protocol/Methods/Initialize/InitializeResponse.php b/src/Protocol/Methods/Initialize/InitializeResponse.php
index e4f927c..33bdf74 100644
--- a/src/Protocol/Methods/Initialize/InitializeResponse.php
+++ b/src/Protocol/Methods/Initialize/InitializeResponse.php
@@ -9,7 +9,7 @@ class InitializeResponse extends Response
     /**
      * The capabilities the language server provides.
      *
-     * @var ServerCapabilities
+     * @var LanguageServer\Protocol\ServerCapabilities
      */
     public $capabilites;
 }
diff --git a/src/Protocol/Methods/ShutdownRequest.php b/src/Protocol/Methods/ShutdownRequest.php
new file mode 100644
index 0000000..44a249c
--- /dev/null
+++ b/src/Protocol/Methods/ShutdownRequest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods;
+
+use LanguageServer\Protocol\Request;
+
+/**
+ * The shutdown request is sent from the client to the server. It asks the server to shut down, but to not exit
+ * (otherwise the response might not be delivered correctly to the client). There is a separate exit notification that
+ * asks the server to exit.
+ */
+class ShutdownRequest extends Request
+{
+    /**
+     * @var null
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/ShutdownResponse.php b/src/Protocol/Methods/ShutdownResponse.php
new file mode 100644
index 0000000..a68d8a0
--- /dev/null
+++ b/src/Protocol/Methods/ShutdownResponse.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods;
+
+use LanguageServer\Protocol\Request;
+
+/**
+ * The shutdown request is sent from the client to the server. It asks the server to shut down, but to not exit
+ * (otherwise the response might not be delivered correctly to the client). There is a separate exit notification that
+ * asks the server to exit.
+ */
+class ShutdownRequest extends Request
+{
+    /**
+     * @var null
+     */
+    public $result;
+}
diff --git a/src/Protocol/Methods/Telemetry/Event.php b/src/Protocol/Methods/Telemetry/EventNotification.php
similarity index 56%
rename from src/Protocol/Methods/Telemetry/Event.php
rename to src/Protocol/Methods/Telemetry/EventNotification.php
index 51dac89..ff53f4f 100644
--- a/src/Protocol/Methods/Telemetry/Event.php
+++ b/src/Protocol/Methods/Telemetry/EventNotification.php
@@ -2,11 +2,16 @@
 
 namespace LanguageServer\Protocol\Telementry;
 
+use LanguageServer\Protocol\Notification;
+
 /**
  * The telemetry notification is sent from the server to the client to ask the client
  * to log a telemetry event.
  */
-class EventParams
+class EventNotification extends Notification
 {
-
+    /**
+     * @var mixed
+     */
+    public $params;
 }
diff --git a/src/Protocol/Methods/TextDocument/CodeActionParams.php b/src/Protocol/Methods/TextDocument/CodeActionParams.php
new file mode 100644
index 0000000..7151aec
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/CodeActionParams.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace LanguageServer\Protocol\TextDocument;
+
+use LanguageServer\Protocol\Params;
+
+/**
+ * Params for the CodeActionRequest
+ */
+class CodeActionParams extends Params
+{
+    /**
+     * The document in which the command was invoked.
+     *
+     * @var LanguageServer\Protocol\TextDocumentIdentifier
+     */
+    public $textDocument;
+
+    /**
+     * The range for which the command was invoked.
+     *
+     * @var LanguageServer\Protocol\Range
+     */
+    public $range;
+
+    /**
+     * Context carrying additional information.
+     *
+     * @var LanguageServer\Protocol\CodeActionContext
+     */
+    public $context;
+}
diff --git a/src/Protocol/Methods/TextDocument/CodeActionRequest.php b/src/Protocol/Methods/TextDocument/CodeActionRequest.php
new file mode 100644
index 0000000..63ff7bb
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/CodeActionRequest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Request;
+
+/**
+ * The code action request is sent from the client to the server to compute commands for a given text document and
+ * range. The request is triggered when the user moves the cursor into a problem marker in the editor or presses the
+ * lightbulb associated with a marker.
+ */
+class CodeActionRequest extends Request
+{
+    /**
+     * @var CodeActionParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/TextDocument/CodeActionResponse.php b/src/Protocol/Methods/TextDocument/CodeActionResponse.php
new file mode 100644
index 0000000..4bc695c
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/CodeActionResponse.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Response;
+
+class CodeActionResponse extends Response
+{
+    /**
+     * @var LanguageServer\Protocol\Command[]
+     */
+    public $result;
+}
diff --git a/src/Protocol/Methods/TextDocument/CodeLensParams.php b/src/Protocol/Methods/TextDocument/CodeLensParams.php
new file mode 100644
index 0000000..7a220b0
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/CodeLensParams.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace LanguageServer\Protocol\TextDocument;
+
+use LanguageServer\Protocol\Params;
+
+class CodeLensParams extends Params
+{
+    /**
+     * The document to request code lens for.
+     *
+     * @var TextDocumentIdentifier
+     */
+    public $textDocument;
+}
diff --git a/src/Protocol/Methods/TextDocument/CodeLensRequest.php b/src/Protocol/Methods/TextDocument/CodeLensRequest.php
new file mode 100644
index 0000000..c0553d9
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/CodeLensRequest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Request;
+
+/**
+ * The code lens request is sent from the client to the server to compute code lenses for a given text document.
+ */
+class CodeLensRequest extends Request
+{
+    /**
+     * @var CodeLensParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/TextDocument/CodeLensResponse.php b/src/Protocol/Methods/TextDocument/CodeLensResponse.php
new file mode 100644
index 0000000..ad66939
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/CodeLensResponse.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Response;
+
+class CodeLensResponse extends Response
+{
+    /**
+     * @var LanguageServer\Protocol\CodeLens[]
+     */
+    public $result;
+}
diff --git a/src/Protocol/Methods/TextDocument/CompletionResponse.php b/src/Protocol/Methods/TextDocument/CompletionResponse.php
index 73b760f..4d0f6ac 100644
--- a/src/Protocol/Methods/TextDocument/CompletionResponse.php
+++ b/src/Protocol/Methods/TextDocument/CompletionResponse.php
@@ -1,17 +1,13 @@
 <?php
 
-namespace LanguageServer\Protocol\TextDocument;
+namespace LanguageServer\Protocol\Methods\TextDocument;
 
 use LanguageServer\Protocol\Response;
 
-/**
- * Diagnostics notification are sent from the server to the client to signal results
- * of validation runs.
- */
-class PublishDiagnosticsParams extends Response
+class CompletionResponse extends Response
 {
     /**
-     * @var CompletionItem[]|CompletionList
+     * @var LanguageServer\Protocol\CompletionItem[]|LanguageServer\Protocol\CompletionList
      */
     public $result;
 }
diff --git a/src/Protocol/Methods/TextDocument/DefinitionRequest.php b/src/Protocol/Methods/TextDocument/DefinitionRequest.php
new file mode 100644
index 0000000..5bc88a1
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/DefinitionRequest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Request;
+
+/**
+ * The goto definition request is sent from the client to the server to resolve the definition location of a symbol at a
+ * given text document position.
+ */
+class DefinitionRequest extends Request
+{
+    /**
+     * @var PositionParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/TextDocument/DefinitionResponse.php b/src/Protocol/Methods/TextDocument/DefinitionResponse.php
new file mode 100644
index 0000000..367fe8a
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/DefinitionResponse.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Response;
+
+class DefinitionResponse extends Response
+{
+    /**
+     * @var LanguageServer\Protocol\Location[]|LanguageServer\Protocol\Location
+     */
+    public $result;
+}
diff --git a/src/Protocol/Methods/TextDocument/DidChangeNotification.php b/src/Protocol/Methods/TextDocument/DidChangeNotification.php
new file mode 100644
index 0000000..dbf3b31
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/DidChangeNotification.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Notification;
+
+/**
+ * The document change notification is sent from the client to the server to signal changes to a text document.
+ */
+class DidChangeNotification extends Notification
+{
+    /**
+     * @var DidChangeParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/TextDocument/DidChangeParams.php b/src/Protocol/Methods/TextDocument/DidChangeParams.php
index fc135c1..644ee8b 100644
--- a/src/Protocol/Methods/TextDocument/DidChangeParams.php
+++ b/src/Protocol/Methods/TextDocument/DidChangeParams.php
@@ -1,26 +1,24 @@
 <?php
 
-namespace LanguageServer\Protocol\TextDocument;
+namespace LanguageServer\Protocol\Methods\TextDocument;
 
-/**
- * The log message notification is sent from the server to the client to ask the
- * client to log a particular message.
- */
-class DidChangeParams
+use LanguageServer\Protocol\Params;
+
+class DidChangeParams extends Params
 {
     /**
-     * The document that did change. The version number points
+     * The document that did change. The version int points
      * to the version after all provided content changes have
      * been applied.
      *
-     * @var VersionedTextDocumentIdentifier
+     * @var LanguageServer\Protocol\VersionedTextDocumentIdentifier
      */
     public $textDocument;
 
     /**
      * The actual content changes.
      *
-     * @var ContentChangeEvent[]
+     * @var LanguageServer\Protocol\TextDocumentContentChangeEvent[]
      */
     public $contentChanges;
 }
diff --git a/src/Protocol/Methods/TextDocument/DidChangeWatchedFilesNotification.php b/src/Protocol/Methods/TextDocument/DidChangeWatchedFilesNotification.php
new file mode 100644
index 0000000..2c7bae9
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/DidChangeWatchedFilesNotification.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Notification;
+
+/**
+ * The watched files notification is sent from the client to the server when the client detects changes to files watched
+ * by the language client.
+ */
+class DidChangeWatchedFilesNotification extends Notification
+{
+    /**
+     * @var DidChangeWatchedFilesParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/TextDocument/DidChangeWatchedFilesParams.php b/src/Protocol/Methods/TextDocument/DidChangeWatchedFilesParams.php
index f4be07f..e1ae4bf 100644
--- a/src/Protocol/Methods/TextDocument/DidChangeWatchedFilesParams.php
+++ b/src/Protocol/Methods/TextDocument/DidChangeWatchedFilesParams.php
@@ -1,19 +1,15 @@
 <?php
 
-namespace LanguageServer\Protocol\TextDocument;
+namespace LanguageServer\Protocol\Methods\TextDocument;
 
 use LanguageServer\Protocol\Params;
 
-/**
- * The watched files notification is sent from the client to the server when the
- * client detects changes to files watched by the language client.
- */
 class DidChangeWatchedFilesParams extends Params
 {
     /**
      * The actual file events.
      *
-     * @var FileEvent[]
+     * @var LanguageServer\Protocol\FileEvent[]
      */
     public $changes;
 }
diff --git a/src/Protocol/Methods/TextDocument/DidCloseNotification.php b/src/Protocol/Methods/TextDocument/DidCloseNotification.php
new file mode 100644
index 0000000..792734e
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/DidCloseNotification.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Notification;
+
+/**
+ * The document close notification is sent from the client to the server when the document got closed in the client. The
+ * document's truth now exists where the document's uri points to (e.g. if the document's uri is a file uri the truth
+ * now exists on disk).
+ */
+class DidCloseNotification extends Notification
+{
+    /**
+     * @var DidCloseParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/TextDocument/DidCloseParams.php b/src/Protocol/Methods/TextDocument/DidCloseParams.php
index b1b693b..b01275d 100644
--- a/src/Protocol/Methods/TextDocument/DidCloseParams.php
+++ b/src/Protocol/Methods/TextDocument/DidCloseParams.php
@@ -1,21 +1,15 @@
 <?php
 
-namespace LanguageServer\Protocol\TextDocument;
+namespace LanguageServer\Protocol\Methods\TextDocument;
 
 use LanguageServer\Protocol\Params;
 
-/**
- * The document close notification is sent from the client to the server when the
- * document got closed in the client. The document's truth now exists where the
- * document's uri points to (e.g. if the document's uri is a file uri the truth now
- * exists on disk).
- */
 class DidCloseTextDocumentParams extends Params
 {
     /**
      * The document that was closed.
      *
-     * @var TextDocumentIdentifier
+     * @var LanguageServer\Protocol\TextDocumentIdentifier
      */
     public $textDocument;
 }
diff --git a/src/Protocol/Methods/TextDocument/DidOpenNotification.php b/src/Protocol/Methods/TextDocument/DidOpenNotification.php
new file mode 100644
index 0000000..017d993
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/DidOpenNotification.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Notification;
+
+/**
+ * The document open notification is sent from the client to the server to signal newly opened text documents. The
+ * document's truth is now managed by the client and the server must not try to read the document's truth using the
+ * document's uri.
+ */
+class DidOpenNotification extends Notification
+{
+    /**
+     * @var DidOpenParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/TextDocument/DidOpenParams.php b/src/Protocol/Methods/TextDocument/DidOpenParams.php
new file mode 100644
index 0000000..b527abc
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/DidOpenParams.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Params;
+
+class DidOpenTextDocumentParams extends Params
+{
+    /**
+     * The document that was opened.
+     *
+     * @var LanguageServer\Protocol\TextDocumentItem
+     */
+    public $textDocument;
+}
diff --git a/src/Protocol/Methods/TextDocument/DidSaveParams.php b/src/Protocol/Methods/TextDocument/DidSaveParams.php
index 91a3dca..cbb1d1a 100644
--- a/src/Protocol/Methods/TextDocument/DidSaveParams.php
+++ b/src/Protocol/Methods/TextDocument/DidSaveParams.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace LanguageServer\Protocol\TextDocument;
+namespace LanguageServer\Protocol\Methods\TextDocument;
 
 use LanguageServer\Protocol\Params;
 
@@ -13,7 +13,7 @@ class DidSaveTextDocumentParams extends Params
     /**
      * The document that was closed.
      *
-     * @var TextDocumentIdentifier
+     * @var LanguageServer\Protocol\TextDocumentIdentifier
      */
     public $textDocument;
 }
diff --git a/src/Protocol/Methods/TextDocument/DocumentHighlightRequest.php b/src/Protocol/Methods/TextDocument/DocumentHighlightRequest.php
new file mode 100644
index 0000000..3505969
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/DocumentHighlightRequest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Request;
+
+/**
+ * The document highlight request is sent from the client to the server to resolve a document highlights for a given
+ * text document position. For programming languages this usually highlights all references to the symbol scoped to this
+ * file. However we kept 'textDocument/documentHighlight' and 'textDocument/references' separate requests since the
+ * first one is allowed to be more fuzzy. Symbol matches usually have a DocumentHighlightKind of Read or Write whereas
+ * fuzzy or textual matches use Textas the kind.
+ */
+class ReferencesRequest extends Request
+{
+    /**
+     * @var PositionParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/TextDocument/DocumentHighlightResponse.php b/src/Protocol/Methods/TextDocument/DocumentHighlightResponse.php
new file mode 100644
index 0000000..ec27dfa
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/DocumentHighlightResponse.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Response;
+
+class ReferencesResponse extends Response
+{
+    /**
+     * @var LanguageServer\Protocol\DocumentHighlight[]
+     */
+    public $result;
+}
diff --git a/src/Protocol/Methods/TextDocument/DocumentSymbolParams.php b/src/Protocol/Methods/TextDocument/DocumentSymbolParams.php
new file mode 100644
index 0000000..91c1435
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/DocumentSymbolParams.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace LanguageServer\Protocol\TextDocument;
+
+use LanguageServer\Protocol\Params;
+
+class DocumentSymbolParams extends Params
+{
+    /**
+	 * The text document.
+     *
+     * @var LanguageServer\Protocol\TextDocumentIdentifier
+	 */
+	public $textDocument;
+}
diff --git a/src/Protocol/Methods/TextDocument/DocumentSymbolRequest.php b/src/Protocol/Methods/TextDocument/DocumentSymbolRequest.php
new file mode 100644
index 0000000..a740ffb
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/DocumentSymbolRequest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Request;
+
+/**
+ * The document symbol request is sent from the client to the server to list all symbols found in a given text document.
+ */
+class DocumentSymbolRequest extends Request
+{
+    /**
+     * @var DocumentSymbolParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/TextDocument/DocumentSymbolResponse.php b/src/Protocol/Methods/TextDocument/DocumentSymbolResponse.php
new file mode 100644
index 0000000..9f8f615
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/DocumentSymbolResponse.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Response;
+
+class DocumentSymbolResponse extends Response
+{
+    /**
+     * @var LanguageServer\Protocol\SymbolInformation[]
+     */
+    public $result;
+}
diff --git a/src/Protocol/Methods/TextDocument/FormattingParams.php b/src/Protocol/Methods/TextDocument/FormattingParams.php
new file mode 100644
index 0000000..841e66f
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/FormattingParams.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace LanguageServer\Protocol\TextDocument;
+
+use LanguageServer\Protocol\Params;
+
+class FormattingParams extends Params
+{
+    /**
+     * The document to format.
+     *
+     * @var LanguageServer\Protocol\TextDocumentIdentifier
+     */
+    public $textDocument;
+
+    /**
+     * The format options.
+     *
+     * @var LanguageServer\Protocol\FormattingOptions
+     */
+    public $options;
+}
diff --git a/src/Protocol/Methods/TextDocument/FormattingRequest.php b/src/Protocol/Methods/TextDocument/FormattingRequest.php
new file mode 100644
index 0000000..e9aa579
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/FormattingRequest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Request;
+
+/**
+ * The document formatting request is sent from the server to the client to format a whole document.
+ */
+class FormattingRequest extends Request
+{
+    /**
+     * @var FormattingParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/TextDocument/FormattingResponse.php b/src/Protocol/Methods/TextDocument/FormattingResponse.php
new file mode 100644
index 0000000..95b9e45
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/FormattingResponse.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Response;
+
+class FormattingResponse extends Response
+{
+    /**
+     * @var LanguageServer\Protocol\TextEdit[]
+     */
+    public $result;
+}
diff --git a/src/Protocol/Methods/TextDocument/HoverResponse.php b/src/Protocol/Methods/TextDocument/HoverResponse.php
index 7e37442..944f3da 100644
--- a/src/Protocol/Methods/TextDocument/HoverResponse.php
+++ b/src/Protocol/Methods/TextDocument/HoverResponse.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace LanguageServer\Protocol\TextDocument;
+namespace LanguageServer\Protocol\Methods\TextDocument;
 
 use LanguageServer\Protocol\Response;
 
 class HoverResponse extends Response
 {
     /**
-     * @var Hover
+     * @var LanguageServer\Protocol\Hover
      */
     public $result;
 }
diff --git a/src/Protocol/Methods/TextDocument/OnTypeFormattingParams.php b/src/Protocol/Methods/TextDocument/OnTypeFormattingParams.php
new file mode 100644
index 0000000..a0d3b78
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/OnTypeFormattingParams.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace LanguageServer\Protocol\TextDocument;
+
+use LanguageServer\Protocol\Params;
+
+class OnTypeFormattingParams extends Params
+{
+    /**
+     * The document to format.
+     *
+     * @var LanguageServer\Protocol\TextDocumentIdentifier
+     */
+    public $textDocument;
+
+    /**
+     * The position at which this request was sent.
+     *
+     * @var LanguageServer\Protocol\Position
+     */
+    public $position;
+
+    /**
+     * The character that has been typed.
+     *
+     * @var string
+     */
+    public $ch;
+
+    /**
+     * The format options.
+     *
+     * @var LanguageServer\Protocol\FormattingOptions
+     */
+    public $options;
+}
diff --git a/src/Protocol/Methods/TextDocument/OnTypeFormattingRequest.php b/src/Protocol/Methods/TextDocument/OnTypeFormattingRequest.php
new file mode 100644
index 0000000..9a4c5a6
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/OnTypeFormattingRequest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Request;
+
+/**
+ * The document on type formatting request is sent from the client to the server to format parts of the document during
+ * typing.
+ */
+class OnTypeFormattingRequest extends Request
+{
+    /**
+     * @var OnTypeFormattingParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/TextDocument/OnTypeFormattingResponse.php b/src/Protocol/Methods/TextDocument/OnTypeFormattingResponse.php
new file mode 100644
index 0000000..3058c9f
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/OnTypeFormattingResponse.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Response;
+
+class OnTypeFormattingResponse extends Response
+{
+    /**
+     * @var LanguageServer\Protocol\TextEdit[]
+     */
+    public $result;
+}
diff --git a/src/Protocol/Methods/TextDocument/PositionParams.php b/src/Protocol/Methods/TextDocument/PositionParams.php
index cdcb7ec..27e1310 100644
--- a/src/Protocol/Methods/TextDocument/PositionParams.php
+++ b/src/Protocol/Methods/TextDocument/PositionParams.php
@@ -1,26 +1,26 @@
 <?php
 
-namespace LanguageServer\Protocol\TextDocument;
+namespace LanguageServer\Protocol\Methods\TextDocument;
 
-use LanguageServer\Protocol\RequestParams;
+use LanguageServer\Protocol\Params;
 
-/*
+/**
  * A parameter literal used in requests to pass a text document and a position inside
  * that document.
  */
-class TextDocumentPositionParams extends RequestParams
+class TextDocumentPositionParams extends Params
 {
     /**
      * The text document.
      *
-     * @var TextDocumentIdentifier
+     * @var LanguageServer\Protocol\TextDocumentIdentifier
      */
     public $textDocument;
 
     /**
      * The position inside the text document.
      *
-     * @var Position
+     * @var LanguageServer\Protocol\Position
      */
     public $position;
 }
diff --git a/src/Protocol/Methods/TextDocument/PublishDiagnosticsNotification.php b/src/Protocol/Methods/TextDocument/PublishDiagnosticsNotification.php
new file mode 100644
index 0000000..d78a98d
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/PublishDiagnosticsNotification.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Notification;
+
+/**
+ * Diagnostics notification are sent from the server to the client to signal results of validation runs.
+ */
+class PublishDiagnosticsNotification extends Notification
+{
+    /**
+     * @var PublishDiagnosticsParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/TextDocument/PublishDiagnosticsParams.php b/src/Protocol/Methods/TextDocument/PublishDiagnosticsParams.php
new file mode 100644
index 0000000..1081187
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/PublishDiagnosticsParams.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace LanguageServer\Protocol\TextDocument;
+
+use LanguageServer\Protocol\Params;
+
+class PublishDiagnosticsParams extends Params
+{
+    /**
+     * The URI for which diagnostic information is reported.
+     *
+     * @var string
+     */
+    public $uri;
+
+    /**
+     * An array of diagnostic information items.
+     *
+     * @var LanguageServer\Protocol\Diagnostic[]
+     */
+    public $diagnostics;
+}
diff --git a/src/Protocol/Methods/TextDocument/RangeFormattingParams.php b/src/Protocol/Methods/TextDocument/RangeFormattingParams.php
new file mode 100644
index 0000000..e802025
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/RangeFormattingParams.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace LanguageServer\Protocol\TextDocument;
+
+use LanguageServer\Protocol\Params;
+
+class RangeFormattingParams extends Params
+{
+    /**
+     * The document to format.
+     *
+     * @var LanguageServer\Protocol\TextDocumentIdentifier
+     */
+    public $textDocument;
+
+    /**
+     * The range to format
+     *
+     * @var LanguageServer\Protocol\Range
+     */
+    public $range;
+
+    /**
+     * The format options
+     *
+     * @var LanguageServer\Protocol\FormattingOptions
+     */
+    public $options;
+}
diff --git a/src/Protocol/Methods/TextDocument/RangeFormattingRequest.php b/src/Protocol/Methods/TextDocument/RangeFormattingRequest.php
new file mode 100644
index 0000000..ceb448f
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/RangeFormattingRequest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Request;
+
+/**
+ * The document range formatting request is sent from the client to the server to format a given range in a document.
+ */
+class RangeFormattingRequest extends Request
+{
+    /**
+     * @var RangeFormattingParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/TextDocument/RangeFormattingResponse.php b/src/Protocol/Methods/TextDocument/RangeFormattingResponse.php
new file mode 100644
index 0000000..a8acecc
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/RangeFormattingResponse.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Response;
+
+class RangeFormattingResponse extends Response
+{
+    /**
+     * @var LanguageServer\Protocol\TextEdit[]
+     */
+    public $result;
+}
diff --git a/src/Protocol/Methods/TextDocument/ReferencesParams.php b/src/Protocol/Methods/TextDocument/ReferencesParams.php
new file mode 100644
index 0000000..1c30670
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/ReferencesParams.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Params;
+
+class ReferencesParams extends Params
+{
+    /**
+     * @var LanguageServer\Protocol\ReferencesContext
+     */
+    public $context;
+}
diff --git a/src/Protocol/Methods/TextDocument/ReferencesRequest.php b/src/Protocol/Methods/TextDocument/ReferencesRequest.php
new file mode 100644
index 0000000..687df48
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/ReferencesRequest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Request;
+
+/**
+ * The references request is sent from the client to the server to resolve project-wide references for the symbol
+ * denoted by the given text document position.
+ */
+class ReferencesRequest extends Request
+{
+    /**
+     * @var ReferenceParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/TextDocument/ReferencesResponse.php b/src/Protocol/Methods/TextDocument/ReferencesResponse.php
new file mode 100644
index 0000000..64f7699
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/ReferencesResponse.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Response;
+
+class ReferencesResponse extends Response
+{
+    /**
+     * @var LanguageServer\Protocol\Location[]
+     */
+    public $result;
+}
diff --git a/src/Protocol/Methods/TextDocument/RenameParams.php b/src/Protocol/Methods/TextDocument/RenameParams.php
new file mode 100644
index 0000000..3f56514
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/RenameParams.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace LanguageServer\Protocol\TextDocument;
+
+use LanguageServer\Protocol\Params;
+
+class RenameParams extends Params
+{
+    /**
+     * The document to format.
+     *
+     * @var LanguageServer\Protocol\TextDocumentIdentifier
+     */
+    public $textDocument;
+
+    /**
+     * The position at which this request was sent.
+     *
+     * @var LanguageServer\Protocol\Position
+     */
+    public $position;
+
+    /**
+     * The new name of the symbol. If the given name is not valid the
+     * request must return a ResponseError with an
+     * appropriate message set.
+     *
+     * @var string
+     */
+    public $newName;
+}
diff --git a/src/Protocol/Methods/TextDocument/RenameRequest.php b/src/Protocol/Methods/TextDocument/RenameRequest.php
new file mode 100644
index 0000000..e8b3dfa
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/RenameRequest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Request;
+
+/**
+ * The rename request is sent from the client to the server to perform a workspace-wide rename of a symbol.
+ */
+class RenameRequest extends Request
+{
+    /**
+     * @var RenameParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/TextDocument/RenameResponse.php b/src/Protocol/Methods/TextDocument/RenameResponse.php
new file mode 100644
index 0000000..d69d57c
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/RenameResponse.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Response;
+
+class RenameResponse extends Response
+{
+    /**
+     * @var LanguageServer\Protocol\WorkspaceEdit
+     */
+    public $result;
+}
diff --git a/src/Protocol/Methods/TextDocument/SignatureHelpRequest.php b/src/Protocol/Methods/TextDocument/SignatureHelpRequest.php
new file mode 100644
index 0000000..04ba741
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/SignatureHelpRequest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Request;
+
+class SignatureHelpRequest extends Request
+{
+    /**
+     * @var PositionParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/TextDocument/SignatureHelpResponse.php b/src/Protocol/Methods/TextDocument/SignatureHelpResponse.php
new file mode 100644
index 0000000..5277575
--- /dev/null
+++ b/src/Protocol/Methods/TextDocument/SignatureHelpResponse.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\TextDocument;
+
+use LanguageServer\Protocol\Response;
+
+class SignatureHelpResponse extends Response
+{
+    /**
+     * @var LanguageServer\Protocol\SignatureHelp
+     */
+    public $result;
+}
diff --git a/src/Protocol/Methods/Window/LogMessageNotification.php b/src/Protocol/Methods/Window/LogMessageNotification.php
new file mode 100644
index 0000000..34f6a82
--- /dev/null
+++ b/src/Protocol/Methods/Window/LogMessageNotification.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace LanguageServer\Protocol\Window;
+
+use LanguageServer\Protocol\Notification;
+
+/**
+ * The log message notification is sent from the server to the client to ask the
+ * client to log a particular message.
+ */
+class LogMessageNotification extends Notification
+{
+    /**
+     * @var LogMessageParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/Window/LogMessageParams.php b/src/Protocol/Methods/Window/LogMessageParams.php
index bcdc64b..73ec59c 100644
--- a/src/Protocol/Methods/Window/LogMessageParams.php
+++ b/src/Protocol/Methods/Window/LogMessageParams.php
@@ -2,18 +2,14 @@
 
 namespace LanguageServer\Protocol\Window;
 
-use LanguageServer\Protocol\RequestParams;
+use LanguageServer\Protocol\Params;
 
-/**
- * The log message notification is sent from the server to the client to ask the
- * client to log a particular message.
- */
-class LogMessageParams extends RequestParams
+class LogMessageParams extends Params
 {
     /**
-     * The message type. See {@link MessageType}
+     * The message type. See LanguageServer\Protocol\MessageType
      *
-     * @var number
+     * @var int
      */
     public $type;
 
diff --git a/src/Protocol/Methods/Window/ShowMessageNotification.php b/src/Protocol/Methods/Window/ShowMessageNotification.php
new file mode 100644
index 0000000..f397665
--- /dev/null
+++ b/src/Protocol/Methods/Window/ShowMessageNotification.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\Windows;
+
+use LanguageServer\Protocol\Notification;
+
+/**
+ * The show message notification is sent from a server to a client to ask the client to display a particular message in
+ * the user interface.
+ */
+class ShowMessageNotification extends Notification
+{
+    /**
+     * @var ShowMessageParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/Window/ShowMessageParams.php b/src/Protocol/Methods/Window/ShowMessageParams.php
index ae0ee16..1872e21 100644
--- a/src/Protocol/Methods/Window/ShowMessageParams.php
+++ b/src/Protocol/Methods/Window/ShowMessageParams.php
@@ -2,10 +2,12 @@
 
 namespace LanguageServer\Protocol\Window;
 
-class ShowMessageParams
+use LanguageServer\Protocol\Params;
+
+class ShowMessageParams extends Params
 {
     /**
-     * The message type. See {@link MessageType}.
+     * The message type. See LanguageServer\Protocol\MessageType
      *
      * @var int
      */
diff --git a/src/Protocol/Methods/Window/ShowMessageRequest.php b/src/Protocol/Methods/Window/ShowMessageRequest.php
new file mode 100644
index 0000000..8507561
--- /dev/null
+++ b/src/Protocol/Methods/Window/ShowMessageRequest.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\Window;
+
+use LanguageServer\Protocol\Request;
+
+/**
+ * The show message request is sent from a server to a client to ask the client to display a particular message in the
+ * user interface. In addition to the show message notification the request allows to pass actions and to wait for an
+ * answer from the client.
+ */
+class ShowMessageRequest extends Request
+{
+    /**
+     * @var ShowMessageRequestParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/Window/ShowMessageRequestParams.php b/src/Protocol/Methods/Window/ShowMessageRequestParams.php
index 426e95d..31a4582 100644
--- a/src/Protocol/Methods/Window/ShowMessageRequestParams.php
+++ b/src/Protocol/Methods/Window/ShowMessageRequestParams.php
@@ -21,7 +21,7 @@ class ShowMessageParams
     /**
      * The message action items to present.
      *
-     * @var MessageActionItem[]|null
+     * @var LanguageServer\Protocol\MessageActionItem[]|null
      */
     public $actions;
 }
diff --git a/src/Protocol/Methods/Workspace/SymbolRequest.php b/src/Protocol/Methods/Workspace/SymbolRequest.php
new file mode 100644
index 0000000..abc56b5
--- /dev/null
+++ b/src/Protocol/Methods/Workspace/SymbolRequest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\Workspace;
+
+use LanguageServer\Protocol\Request;
+
+class SymbolRequest extends Request
+{
+    /**
+     * @var SymbolParams
+     */
+    public $params;
+}
diff --git a/src/Protocol/Methods/Workspace/SymbolResponse.php b/src/Protocol/Methods/Workspace/SymbolResponse.php
new file mode 100644
index 0000000..9a4e1ed
--- /dev/null
+++ b/src/Protocol/Methods/Workspace/SymbolResponse.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol\Methods\Workspace;
+
+use LanguageServer\Protocol\Response;
+
+class SymbolResponse extends Response
+{
+    /**
+     * @var LanguageServer\Protocol\SymbolInformation[]
+     */
+    public $result;
+}
diff --git a/src/Protocol/ParameterInformation.php b/src/Protocol/ParameterInformation.php
new file mode 100644
index 0000000..89b5e53
--- /dev/null
+++ b/src/Protocol/ParameterInformation.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+/**
+ * Represents a parameter of a callable-signature. A parameter can
+ * have a label and a doc-comment.
+ */
+class ParameterInformation
+{
+    /**
+     * The label of this signature. Will be shown in
+     * the UI.
+     *
+     * @var string
+     */
+    public $label;
+
+    /**
+     * The human-readable doc-comment of this signature. Will be shown
+     * in the UI but can be omitted.
+     *
+     * @var string|null
+     */
+    public $documentation;
+}
diff --git a/src/Protocol/Params.php b/src/Protocol/Params.php
index 96004a4..a5f1b97 100644
--- a/src/Protocol/Params.php
+++ b/src/Protocol/Params.php
@@ -2,7 +2,7 @@
 
 namespace LanguageServer\Protocol;
 
-abstract class Params
+class Params
 {
 
 }
diff --git a/src/Protocol/Position.php b/src/Protocol/Position.php
new file mode 100644
index 0000000..026d1fa
--- /dev/null
+++ b/src/Protocol/Position.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+/**
+ * Position in a text document expressed as zero-based line and character offset.
+ */
+class Position
+{
+    /**
+     * Line position in a document (zero-based).
+     *
+     * @var int
+     */
+    public $line;
+
+    /**
+     * Character offset on a line in a document (zero-based).
+     *
+     * @var int
+     */
+    public $character;
+}
diff --git a/src/Protocol/ProtocolServer.php b/src/Protocol/ProtocolServer.php
index e664e3a..46ff43d 100644
--- a/src/Protocol/ProtocolServer.php
+++ b/src/Protocol/ProtocolServer.php
@@ -48,7 +48,7 @@ class ProtocolServer extends EventEmitter
                     break;
                 case ParsingMode::BODY:
                     if (strlen($buffer) === $contentLength) {
-                        $req = Request::parse($body);
+                        $req = Message::parse($body, Request::class);
                         $this->emit($body->method, [$req]);
                         $this->parsingMode = ParsingMode::HEADERS;
                         $this->buffer = '';
diff --git a/src/Protocol/PublishDiagnosticParams.php b/src/Protocol/PublishDiagnosticParams.php
index d81382c..c1180c7 100644
--- a/src/Protocol/PublishDiagnosticParams.php
+++ b/src/Protocol/PublishDiagnosticParams.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace LanguageServer\Protocol\TextDocument;
-
-use LanguageServer\Protocol\RequestParams;
+namespace LanguageServer\Protocol;
 
 /**
  * Diagnostics notification are sent from the server to the client to signal results
diff --git a/src/Protocol/Range.php b/src/Protocol/Range.php
new file mode 100644
index 0000000..0a562e0
--- /dev/null
+++ b/src/Protocol/Range.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+/**
+ * A range in a text document expressed as (zero-based) start and end positions.
+ */
+class Range
+{
+    /**
+     * The range's start position.
+     *
+     * @var Position
+     */
+    public $start;
+
+    /**
+     * The range's end position.
+     *
+     * @var Position
+     */
+    public $end;
+}
diff --git a/src/Protocol/ReferenceContext.php b/src/Protocol/ReferenceContext.php
new file mode 100644
index 0000000..f0c3b12
--- /dev/null
+++ b/src/Protocol/ReferenceContext.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+class ReferenceContext
+{
+	/**
+	 * Include the declaration of the current symbol.
+     *
+     * @var bool
+	 */
+	public $includeDeclaration;
+}
diff --git a/src/Protocol/Request.php b/src/Protocol/Request.php
index 92f209f..3f6ff25 100644
--- a/src/Protocol/Request.php
+++ b/src/Protocol/Request.php
@@ -2,8 +2,10 @@
 
 namespace LanguageServer\Protocol;
 
-use JsonMapper;
-
+/**
+ * A request message to describe a request between the client and the server. Every processed request must send a
+ * response back to the sender of the request.
+ */
 class Request extends Message
 {
     /**
@@ -17,27 +19,7 @@ class Request extends Message
     public $method;
 
     /**
-     * @var object
+     * @var Params
      */
     public $params;
-
-    public static function parse(string $body)
-    {
-        $mapper = new JsonMapper();
-        $request->id = $decoded->id;
-        $request->method = $decoded->method;
-        $pascalCasedMethod = ucfirst($decoded->method);
-        $namespace = __NAMESPACE__ . '\\' . str_replace('/', '\\', $pascalCasedMethod);
-        $className = end(explode('\\', $request->method)) . 'Params';
-        $fullyQualifiedName = $namespace . $className;
-        $mapper->classMap['RequestParams'] = $fullyQualifiedName;
-        $request = $mapper->map(json_decode($body), new self());
-        if (class_exists($fullyQualifiedName)) {
-            $request->params = new $fullyQualifiedName();
-        }
-        foreach ($request->params as $key => $value) {
-            $request->{$key} = $value;
-        }
-        return $request;
-    }
 }
diff --git a/src/Protocol/ResponseError.php b/src/Protocol/ResponseError.php
index 134d955..3d0bd9e 100644
--- a/src/Protocol/ResponseError.php
+++ b/src/Protocol/ResponseError.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace LanguageServer\Protocol;
+
 class ResponseError
 {
     /**
diff --git a/src/Protocol/SignatureHelp.php b/src/Protocol/SignatureHelp.php
new file mode 100644
index 0000000..407b25a
--- /dev/null
+++ b/src/Protocol/SignatureHelp.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+/**
+ * Signature help represents the signature of something
+ * callable. There can be multiple signature but only one
+ * active and only one active parameter.
+ */
+class SignatureHelp
+{
+    /**
+     * One or more signatures.
+     *
+     * @var SignatureInformation[]
+     */
+    public $signatures;
+
+    /**
+     * The active signature.
+     *
+     * @var int|null
+     */
+    public $activeSignature;
+
+    /**
+     * The active parameter of the active signature.
+     *
+     * @var int|null
+     */
+    public $activeParameter;
+}
diff --git a/src/Protocol/ServerCapabilities/SignatureHelpOptions.php b/src/Protocol/SignatureHelpOptions.php
similarity index 75%
rename from src/Protocol/ServerCapabilities/SignatureHelpOptions.php
rename to src/Protocol/SignatureHelpOptions.php
index 513b3d4..25b0e37 100644
--- a/src/Protocol/ServerCapabilities/SignatureHelpOptions.php
+++ b/src/Protocol/SignatureHelpOptions.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace LanguageServer\Protocol\Methods\Initialize\ServerCapabilities;
+namespace LanguageServer\Protocol;
 
 /**
  * Signature help options.
diff --git a/src/Protocol/SignatureInformation.php b/src/Protocol/SignatureInformation.php
new file mode 100644
index 0000000..77e152c
--- /dev/null
+++ b/src/Protocol/SignatureInformation.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+/**
+ * Represents the signature of something callable. A signature
+ * can have a label, like a function-name, a doc-comment, and
+ * a set of parameters.
+ */
+class SignatureInformation
+{
+    /**
+     * The label of this signature. Will be shown in
+     * the UI.
+     *
+     * @var string
+     */
+    public $label;
+
+    /**
+     * The human-readable doc-comment of this signature. Will be shown
+     * in the UI but can be omitted.
+     *
+     * @var string|null
+     */
+    public $documentation;
+
+    /**
+     * The parameters of this signature.
+     *
+     * @var ParameterInformation[]|null
+     */
+    public $parameters;
+}
diff --git a/src/Protocol/SymbolInformation.php b/src/Protocol/SymbolInformation.php
new file mode 100644
index 0000000..12e9ccc
--- /dev/null
+++ b/src/Protocol/SymbolInformation.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+/**
+ * Represents information about programming constructs like variables, classes,
+ * interfaces etc.
+ */
+class SymbolInformation
+{
+    /**
+     * The name of this symbol.
+     *
+     * @var string
+     */
+    public $name;
+
+    /**
+     * The kind of this symbol.
+     *
+     * @var number
+     */
+    public $kind;
+
+    /**
+     * The location of this symbol.
+     *
+     * @var Location
+     */
+    public $location;
+
+    /**
+     * The name of the symbol containing this symbol.
+     *
+     * @var string|null
+     */
+    public $containerName;
+}
diff --git a/src/Protocol/SymbolKind.php b/src/Protocol/SymbolKind.php
new file mode 100644
index 0000000..2603bb0
--- /dev/null
+++ b/src/Protocol/SymbolKind.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+/**
+ * A symbol kind.
+ */
+abstract class SymbolKind
+{
+    const FILE = 1;
+    const MODULE = 2;
+    const NAMESPACE = 3;
+    const PACKAGE = 4;
+    const _CLASS = 5;
+    const METHOD = 6;
+    const PROPERTY = 7;
+    const FIELD = 8;
+    const CONSTRUCTOR = 9;
+    const ENUM = 10;
+    const INTERFACE = 11;
+    const FUNCTION = 12;
+    const VARIABLE = 13;
+    const CONSTANT = 14;
+    const STRING = 15;
+    const NUMBER = 16;
+    const BOOLEAN = 17;
+    const ARRAY = 18;
+}
diff --git a/src/Protocol/TextDocumentContentChangeEvent.php b/src/Protocol/TextDocumentContentChangeEvent.php
new file mode 100644
index 0000000..9cfa08b
--- /dev/null
+++ b/src/Protocol/TextDocumentContentChangeEvent.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+/**
+ * An event describing a change to a text document. If range and rangeLength are omitted
+ * the new text is considered to be the full content of the document.
+ */
+class TextDocumentContentChangeEvent
+{
+    /**
+     * The range of the document that changed.
+     *
+     * @var Range|null
+     */
+    public $range;
+
+    /**
+     * The length of the range that got replaced.
+     *
+     * @var int|null
+     */
+    public $rangeLength;
+
+    /**
+     * The new text of the document.
+     *
+     * @var string
+     */
+    public $text;
+}
diff --git a/src/Protocol/TextDocumentIdentifier.php b/src/Protocol/TextDocumentIdentifier.php
new file mode 100644
index 0000000..f11af85
--- /dev/null
+++ b/src/Protocol/TextDocumentIdentifier.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+class TextDocumentIdentifier
+{
+    /**
+     * The text document's URI.
+     *
+     * @var string
+     */
+    public $uri;
+}
diff --git a/src/Protocol/TextDocumentItem.php b/src/Protocol/TextDocumentItem.php
new file mode 100644
index 0000000..0c86664
--- /dev/null
+++ b/src/Protocol/TextDocumentItem.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+/**
+ * An item to transfer a text document from the client to the server.
+ */
+class TextDocumentItem
+{
+    /**
+     * The text document's URI.
+     *
+     * @var string
+     */
+    public $uri;
+
+    /**
+     * The text document's language identifier.
+     *
+     * @var string
+     */
+    public $languageId;
+
+    /**
+     * The version number of this document (it will strictly increase after each
+     * change, including undo/redo).
+     *
+     * @var int
+     */
+    public $version;
+
+    /**
+     * The content of the opened text document.
+     *
+     * @var string
+     */
+    public $text;
+}
diff --git a/src/Protocol/ServerCapabilities/TextDocumentSyncKind.php b/src/Protocol/TextDocumentSyncKind.php
similarity index 87%
rename from src/Protocol/ServerCapabilities/TextDocumentSyncKind.php
rename to src/Protocol/TextDocumentSyncKind.php
index 93b7b0c..313e29d 100644
--- a/src/Protocol/ServerCapabilities/TextDocumentSyncKind.php
+++ b/src/Protocol/TextDocumentSyncKind.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace LanguageServer\Protocol\Methods\Initialize\ServerCapabilities;
+namespace LanguageServer\Protocol;
 
 /**
  * Defines how the host (editor) should sync document changes to the language server.
diff --git a/src/Protocol/TextEdit.php b/src/Protocol/TextEdit.php
new file mode 100644
index 0000000..c13a3c5
--- /dev/null
+++ b/src/Protocol/TextEdit.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+/**
+ * A textual edit applicable to a text document.
+ */
+class TextEdit
+{
+    /**
+     * The range of the text document to be manipulated. To insert
+     * text into a document create a range where start === end.
+     *
+     * @var Range
+     */
+    public $range;
+
+    /**
+     * The string to be inserted. For delete operations use an
+     * empty string.
+     *
+     * @var string
+     */
+    public $newText;
+}
diff --git a/src/Protocol/VersionedTextDocumentIdentifier.php b/src/Protocol/VersionedTextDocumentIdentifier.php
new file mode 100644
index 0000000..ba74e42
--- /dev/null
+++ b/src/Protocol/VersionedTextDocumentIdentifier.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+class VersionedTextDocumentIdentifier extends TextDocumentIdentifier
+{
+    /**
+     * The version number of this document.
+     *
+     * @var int
+     */
+    public $version;
+}
diff --git a/src/Protocol/WorkspaceEdit.php b/src/Protocol/WorkspaceEdit.php
new file mode 100644
index 0000000..7414dd0
--- /dev/null
+++ b/src/Protocol/WorkspaceEdit.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace LanguageServer\Protocol;
+
+/**
+ * A workspace edit represents changes to many resources managed in the workspace.
+ */
+class WorkspaceEdit
+{
+    /**
+     * Holds changes to existing resources. Associative Array from URI to TextEdit
+     *
+     * @var TextEdit[]
+     */
+    public $changes;
+}