diff --git a/src/Api/EndpointResolver.php b/src/Resolvers/EndpointResolver.php
similarity index 77%
rename from src/Api/EndpointResolver.php
rename to src/Resolvers/EndpointResolver.php
index 0962f2d..37833f8 100644
--- a/src/Api/EndpointResolver.php
+++ b/src/Resolvers/EndpointResolver.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace Corp104\Rester\Api;
+namespace Corp104\Rester\Resolvers;
 
+use Corp104\Rester\Api\Endpoint;
 use Corp104\Rester\Resolver;
 
 /**
diff --git a/src/Api/PathResolver.php b/src/Resolvers/PathResolver.php
similarity index 77%
rename from src/Api/PathResolver.php
rename to src/Resolvers/PathResolver.php
index d1102e5..1448099 100644
--- a/src/Api/PathResolver.php
+++ b/src/Resolvers/PathResolver.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace Corp104\Rester\Api;
+namespace Corp104\Rester\Resolvers;
 
+use Corp104\Rester\Api\Path;
 use Corp104\Rester\Resolver;
 
 /**
diff --git a/tests/Rester/MappingTest.php b/tests/Rester/MappingTest.php
index b078caf..bd485fb 100644
--- a/tests/Rester/MappingTest.php
+++ b/tests/Rester/MappingTest.php
@@ -4,12 +4,12 @@
 
 use Corp104\Rester\Api\ApiInterface;
 use Corp104\Rester\Api\Endpoint;
-use Corp104\Rester\Api\EndpointResolver;
 use Corp104\Rester\Api\Path;
-use Corp104\Rester\Api\PathResolver;
 use Corp104\Rester\Exceptions\ApiNotFoundException;
 use Corp104\Rester\Exceptions\InvalidArgumentException;
 use Corp104\Rester\Mapping;
+use Corp104\Rester\Resolvers\EndpointResolver;
+use Corp104\Rester\Resolvers\PathResolver;
 use Tests\TestCase;
 
 class MappingTest extends TestCase