diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e3dd40..5121d40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Added
 - Issue #5: `ResultInterface::get()` method added.
+### Fixed
+- Issue #6: locator builder moved to correct namespace.
 
 ## [0.6.3] - 2019-11-18
 ### Fixed
diff --git a/src/Locator/Exception/ExceptionInterface.php b/src/Locator/Exception/ExceptionInterface.php
new file mode 100644
index 0000000..55885b6
--- /dev/null
+++ b/src/Locator/Exception/ExceptionInterface.php
@@ -0,0 +1,10 @@
+<?php
+declare(strict_types=1);
+
+namespace Remorhaz\JSON\Pointer\Locator\Exception;
+
+use Remorhaz\JSON\Pointer\Exception\ExceptionInterface as PointerExceptionInterface;
+
+interface ExceptionInterface extends PointerExceptionInterface
+{
+}
diff --git a/src/Parser/Exception/LocatorAlreadyBuiltException.php b/src/Locator/Exception/LocatorAlreadyBuiltException.php
similarity index 85%
rename from src/Parser/Exception/LocatorAlreadyBuiltException.php
rename to src/Locator/Exception/LocatorAlreadyBuiltException.php
index a766e72..3db464e 100644
--- a/src/Parser/Exception/LocatorAlreadyBuiltException.php
+++ b/src/Locator/Exception/LocatorAlreadyBuiltException.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Remorhaz\JSON\Pointer\Parser\Exception;
+namespace Remorhaz\JSON\Pointer\Locator\Exception;
 
 use LogicException;
 use Throwable;
diff --git a/src/Parser/LocatorBuilder.php b/src/Locator/LocatorBuilder.php
similarity index 81%
rename from src/Parser/LocatorBuilder.php
rename to src/Locator/LocatorBuilder.php
index ca03512..100151c 100644
--- a/src/Parser/LocatorBuilder.php
+++ b/src/Locator/LocatorBuilder.php
@@ -1,11 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Remorhaz\JSON\Pointer\Parser;
-
-use Remorhaz\JSON\Pointer\Locator\Locator;
-use Remorhaz\JSON\Pointer\Locator\LocatorInterface;
-use Remorhaz\JSON\Pointer\Locator\ReferenceFactoryInterface;
+namespace Remorhaz\JSON\Pointer\Locator;
 
 final class LocatorBuilder implements LocatorBuilderInterface
 {
@@ -16,6 +12,11 @@ final class LocatorBuilder implements LocatorBuilderInterface
 
     private $references = [];
 
+    public static function create(): LocatorBuilderInterface
+    {
+        return new self(new ReferenceFactory);
+    }
+
     public function __construct(ReferenceFactoryInterface $referenceFactory)
     {
         $this->referenceFactory = $referenceFactory;
diff --git a/src/Parser/LocatorBuilderInterface.php b/src/Locator/LocatorBuilderInterface.php
similarity index 65%
rename from src/Parser/LocatorBuilderInterface.php
rename to src/Locator/LocatorBuilderInterface.php
index 39d1501..501554e 100644
--- a/src/Parser/LocatorBuilderInterface.php
+++ b/src/Locator/LocatorBuilderInterface.php
@@ -1,9 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Remorhaz\JSON\Pointer\Parser;
-
-use Remorhaz\JSON\Pointer\Locator\LocatorInterface;
+namespace Remorhaz\JSON\Pointer\Locator;
 
 interface LocatorBuilderInterface
 {
diff --git a/src/Parser/Ll1ParserFactory.php b/src/Parser/Ll1ParserFactory.php
index 99ac74a..c1d0d07 100644
--- a/src/Parser/Ll1ParserFactory.php
+++ b/src/Parser/Ll1ParserFactory.php
@@ -3,6 +3,7 @@
 
 namespace Remorhaz\JSON\Pointer\Parser;
 
+use Remorhaz\JSON\Pointer\Locator\LocatorBuilderInterface;
 use Remorhaz\JSON\Pointer\TokenMatcher;
 use Remorhaz\UniLex\Exception as UnilexException;
 use Remorhaz\UniLex\Grammar\ContextFree\GrammarInterface;
diff --git a/src/Parser/Ll1ParserFactoryInterface.php b/src/Parser/Ll1ParserFactoryInterface.php
index 7abc1e0..11eae17 100644
--- a/src/Parser/Ll1ParserFactoryInterface.php
+++ b/src/Parser/Ll1ParserFactoryInterface.php
@@ -3,6 +3,7 @@
 
 namespace Remorhaz\JSON\Pointer\Parser;
 
+use Remorhaz\JSON\Pointer\Locator\LocatorBuilderInterface;
 use Remorhaz\UniLex\Parser\LL1\Parser as Ll1Parser;
 
 interface Ll1ParserFactoryInterface
diff --git a/src/Parser/Parser.php b/src/Parser/Parser.php
index 43515fc..cdb874d 100644
--- a/src/Parser/Parser.php
+++ b/src/Parser/Parser.php
@@ -3,6 +3,7 @@
 
 namespace Remorhaz\JSON\Pointer\Parser;
 
+use Remorhaz\JSON\Pointer\Locator\LocatorBuilder;
 use Remorhaz\JSON\Pointer\Locator\LocatorInterface;
 use Remorhaz\JSON\Pointer\Locator\ReferenceFactory;
 use Remorhaz\JSON\Pointer\Locator\ReferenceFactoryInterface;
diff --git a/src/Parser/TranslationScheme.php b/src/Parser/TranslationScheme.php
index e639cc1..c36a5ab 100644
--- a/src/Parser/TranslationScheme.php
+++ b/src/Parser/TranslationScheme.php
@@ -3,6 +3,7 @@
 
 namespace Remorhaz\JSON\Pointer\Parser;
 
+use Remorhaz\JSON\Pointer\Locator\LocatorBuilderInterface;
 use Remorhaz\UniLex\Grammar\SDD\TranslationSchemeInterface;
 use Remorhaz\UniLex\Lexer\Token;
 use Remorhaz\UniLex\Parser\Production;
diff --git a/tests/Parser/Exception/LocatorAlreadyBuiltExceptionTest.php b/tests/Locator/Exception/LocatorAlreadyBuiltExceptionTest.php
similarity index 82%
rename from tests/Parser/Exception/LocatorAlreadyBuiltExceptionTest.php
rename to tests/Locator/Exception/LocatorAlreadyBuiltExceptionTest.php
index 54cf7c9..0573c7c 100644
--- a/tests/Parser/Exception/LocatorAlreadyBuiltExceptionTest.php
+++ b/tests/Locator/Exception/LocatorAlreadyBuiltExceptionTest.php
@@ -1,14 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace Remorhaz\JSON\Pointer\Test\Parser\Exception;
+namespace Remorhaz\JSON\Pointer\Test\Locator\Exception;
 
 use Exception;
 use PHPUnit\Framework\TestCase;
-use Remorhaz\JSON\Pointer\Parser\Exception\LocatorAlreadyBuiltException;
+use Remorhaz\JSON\Pointer\Locator\Exception\LocatorAlreadyBuiltException;
 
 /**
- * @covers \Remorhaz\JSON\Pointer\Parser\Exception\LocatorAlreadyBuiltException
+ * @covers \Remorhaz\JSON\Pointer\Locator\Exception\LocatorAlreadyBuiltException
  */
 class LocatorAlreadyBuiltExceptionTest extends TestCase
 {
diff --git a/tests/Parser/LocatorBuilderTest.php b/tests/Locator/LocatorBuilderTest.php
similarity index 86%
rename from tests/Parser/LocatorBuilderTest.php
rename to tests/Locator/LocatorBuilderTest.php
index 276dd0c..b552038 100644
--- a/tests/Parser/LocatorBuilderTest.php
+++ b/tests/Locator/LocatorBuilderTest.php
@@ -1,22 +1,27 @@
 <?php
 declare(strict_types=1);
 
-namespace Remorhaz\JSON\Pointer\Test\Parser;
+namespace Remorhaz\JSON\Pointer\Test\Locator;
 
 use PHPUnit\Framework\TestCase;
 use Remorhaz\JSON\Pointer\Locator\ListedReferenceInterface;
 use Remorhaz\JSON\Pointer\Locator\ReferenceFactoryInterface;
 use Remorhaz\JSON\Pointer\Locator\ReferenceInterface;
-use Remorhaz\JSON\Pointer\Parser\Exception\LocatorAlreadyBuiltException;
-use Remorhaz\JSON\Pointer\Parser\LocatorBuilder;
+use Remorhaz\JSON\Pointer\Locator\Exception\LocatorAlreadyBuiltException;
+use Remorhaz\JSON\Pointer\Locator\LocatorBuilder;
 use function array_map;
 
 /**
- * @covers \Remorhaz\JSON\Pointer\Parser\LocatorBuilder
+ * @covers \Remorhaz\JSON\Pointer\Locator\LocatorBuilder
  */
 class LocatorBuilderTest extends TestCase
 {
 
+    public function testCreate_Always_ReturnsLocatorBuilderInstance(): void
+    {
+        self::assertInstanceOf(LocatorBuilder::class, LocatorBuilder::create());
+    }
+
     public function testGetLocator_ReferencesNotAdded_ReturnsEmptyLocator(): void
     {
         $builder = new LocatorBuilder($this->createMock(ReferenceFactoryInterface::class));
diff --git a/tests/Parser/TranslationSchemeTest.php b/tests/Parser/TranslationSchemeTest.php
index 9baccf6..83f0663 100644
--- a/tests/Parser/TranslationSchemeTest.php
+++ b/tests/Parser/TranslationSchemeTest.php
@@ -4,7 +4,7 @@
 namespace Remorhaz\JSON\Pointer\Test\Parser;
 
 use PHPUnit\Framework\TestCase;
-use Remorhaz\JSON\Pointer\Parser\LocatorBuilderInterface;
+use Remorhaz\JSON\Pointer\Locator\LocatorBuilderInterface;
 use Remorhaz\JSON\Pointer\Parser\TranslationScheme;
 use Remorhaz\JSON\Pointer\TokenMatcher;
 use Remorhaz\UniLex\Exception as UniLexException;