diff --git a/src/ColumnCalculator.php b/src/NodeVisitors/ColumnCalculator.php
similarity index 96%
rename from src/ColumnCalculator.php
rename to src/NodeVisitors/ColumnCalculator.php
index 9050264..102c37c 100644
--- a/src/ColumnCalculator.php
+++ b/src/NodeVisitors/ColumnCalculator.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types = 1);
 
-namespace LanguageServer;
+namespace LanguageServer\NodeVisitors;
 
 use PhpParser\{NodeVisitorAbstract, Node};
 
diff --git a/src/SymbolFinder.php b/src/NodeVisitors/SymbolFinder.php
similarity index 98%
rename from src/SymbolFinder.php
rename to src/NodeVisitors/SymbolFinder.php
index f49677c..31e7c1c 100644
--- a/src/SymbolFinder.php
+++ b/src/NodeVisitors/SymbolFinder.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types = 1);
 
-namespace LanguageServer;
+namespace LanguageServer\NodeVisitors;
 
 use PhpParser\{NodeVisitorAbstract, Node};
 
diff --git a/src/PhpDocument.php b/src/PhpDocument.php
index febff0e..e394bc2 100644
--- a/src/PhpDocument.php
+++ b/src/PhpDocument.php
@@ -3,8 +3,8 @@ declare(strict_types = 1);
 
 namespace LanguageServer;
 
-use \LanguageServer\Protocol\{Diagnostic, DiagnosticSeverity, Range, Position, SymbolKind, TextEdit};
-
+use LanguageServer\Protocol\{Diagnostic, DiagnosticSeverity, Range, Position, SymbolKind, TextEdit};
+use LanguageServer\NodeVisitors\{SymbolFinder, ColumnCalculator};
 use PhpParser\{Error, Comment, Node, ParserFactory, NodeTraverser, Lexer, Parser};
 use PhpParser\PrettyPrinter\Standard as PrettyPrinter;
 use PhpParser\NodeVisitor\NameResolver;