diff --git a/src/Eloquent/Cosmos/ClassName/Resolver/BoundClassNameResolver.php b/src/Eloquent/Cosmos/Resolution/BoundClassNameResolver.php
similarity index 93%
rename from src/Eloquent/Cosmos/ClassName/Resolver/BoundClassNameResolver.php
rename to src/Eloquent/Cosmos/Resolution/BoundClassNameResolver.php
index 9e407a5..2156a78 100644
--- a/src/Eloquent/Cosmos/ClassName/Resolver/BoundClassNameResolver.php
+++ b/src/Eloquent/Cosmos/Resolution/BoundClassNameResolver.php
@@ -9,12 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Eloquent\Cosmos\ClassName\Resolver;
+namespace Eloquent\Cosmos\Resolution;
 
 use Eloquent\Cosmos\ClassName\ClassNameInterface;
 use Eloquent\Cosmos\ClassName\QualifiedClassNameInterface;
-use Eloquent\Cosmos\ClassName\ResolutionContext;
-use Eloquent\Cosmos\ClassName\ResolutionContextInterface;
 
 /**
  * Resolves class names against a bound context.
diff --git a/src/Eloquent/Cosmos/ClassName/Resolver/BoundClassNameResolverInterface.php b/src/Eloquent/Cosmos/Resolution/BoundClassNameResolverInterface.php
similarity index 95%
rename from src/Eloquent/Cosmos/ClassName/Resolver/BoundClassNameResolverInterface.php
rename to src/Eloquent/Cosmos/Resolution/BoundClassNameResolverInterface.php
index eed9bc0..15f0821 100644
--- a/src/Eloquent/Cosmos/ClassName/Resolver/BoundClassNameResolverInterface.php
+++ b/src/Eloquent/Cosmos/Resolution/BoundClassNameResolverInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Eloquent\Cosmos\ClassName\Resolver;
+namespace Eloquent\Cosmos\Resolution;
 
 use Eloquent\Cosmos\ClassName\ClassNameInterface;
 use Eloquent\Cosmos\ClassName\QualifiedClassNameInterface;
diff --git a/src/Eloquent/Cosmos/ClassName/Resolver/ClassNameResolver.php b/src/Eloquent/Cosmos/Resolution/ClassNameResolver.php
similarity index 92%
rename from src/Eloquent/Cosmos/ClassName/Resolver/ClassNameResolver.php
rename to src/Eloquent/Cosmos/Resolution/ClassNameResolver.php
index 46a5c98..bef5fac 100644
--- a/src/Eloquent/Cosmos/ClassName/Resolver/ClassNameResolver.php
+++ b/src/Eloquent/Cosmos/Resolution/ClassNameResolver.php
@@ -9,11 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Eloquent\Cosmos\ClassName\Resolver;
+namespace Eloquent\Cosmos\Resolution;
 
 use Eloquent\Cosmos\ClassName\ClassNameInterface;
 use Eloquent\Cosmos\ClassName\QualifiedClassNameInterface;
-use Eloquent\Cosmos\ClassName\ResolutionContextInterface;
 
 /**
  * Resolves class names against a supplied context.
diff --git a/src/Eloquent/Cosmos/ClassName/Resolver/ClassNameResolverInterface.php b/src/Eloquent/Cosmos/Resolution/ClassNameResolverInterface.php
similarity index 90%
rename from src/Eloquent/Cosmos/ClassName/Resolver/ClassNameResolverInterface.php
rename to src/Eloquent/Cosmos/Resolution/ClassNameResolverInterface.php
index 2de1ef3..865a743 100644
--- a/src/Eloquent/Cosmos/ClassName/Resolver/ClassNameResolverInterface.php
+++ b/src/Eloquent/Cosmos/Resolution/ClassNameResolverInterface.php
@@ -9,11 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Eloquent\Cosmos\ClassName\Resolver;
+namespace Eloquent\Cosmos\Resolution;
 
 use Eloquent\Cosmos\ClassName\ClassNameInterface;
 use Eloquent\Cosmos\ClassName\QualifiedClassNameInterface;
-use Eloquent\Cosmos\ClassName\ResolutionContextInterface;
 
 /**
  * The interface implemented by class name resolvers.
diff --git a/src/Eloquent/Cosmos/ClassName/Resolver/Consumer/ClassNameResolverTrait.php b/src/Eloquent/Cosmos/Resolution/Consumer/ClassNameResolverTrait.php
similarity index 87%
rename from src/Eloquent/Cosmos/ClassName/Resolver/Consumer/ClassNameResolverTrait.php
rename to src/Eloquent/Cosmos/Resolution/Consumer/ClassNameResolverTrait.php
index 64b00cf..034bc37 100644
--- a/src/Eloquent/Cosmos/ClassName/Resolver/Consumer/ClassNameResolverTrait.php
+++ b/src/Eloquent/Cosmos/Resolution/Consumer/ClassNameResolverTrait.php
@@ -9,10 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Eloquent\Cosmos\ClassName\Resolver\Consumer;
+namespace Eloquent\Cosmos\Resolution\Consumer;
 
-use Eloquent\Cosmos\ClassName\Resolver\ClassNameResolver;
-use Eloquent\Cosmos\ClassName\Resolver\ClassNameResolverInterface;
+use Eloquent\Cosmos\Resolution\ClassNameResolver;
+use Eloquent\Cosmos\Resolution\ClassNameResolverInterface;
 
 /**
  * A trait for classes that take a class name resolver as a dependency.
diff --git a/src/Eloquent/Cosmos/ClassName/ResolutionContext.php b/src/Eloquent/Cosmos/Resolution/ResolutionContext.php
similarity index 83%
rename from src/Eloquent/Cosmos/ClassName/ResolutionContext.php
rename to src/Eloquent/Cosmos/Resolution/ResolutionContext.php
index 41111fe..ca3e773 100644
--- a/src/Eloquent/Cosmos/ClassName/ResolutionContext.php
+++ b/src/Eloquent/Cosmos/Resolution/ResolutionContext.php
@@ -9,7 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Eloquent\Cosmos\ClassName;
+namespace Eloquent\Cosmos\Resolution;
+
+use Eloquent\Cosmos\ClassName\ClassNameReference;
+use Eloquent\Cosmos\ClassName\ClassNameReferenceInterface;
+use Eloquent\Cosmos\ClassName\Factory\ClassNameFactory;
+use Eloquent\Cosmos\ClassName\Factory\ClassNameFactoryInterface;
+use Eloquent\Cosmos\ClassName\QualifiedClassNameInterface;
 
 /**
  * Represents a combined namespace and set of use statements.
@@ -19,17 +25,17 @@ class ResolutionContext implements ResolutionContextInterface
     /**
      * Construct a new class name resolution context.
      *
-     * @param QualifiedClassNameInterface|null       $primaryNamespace The namespace.
-     * @param array<UseStatementInterface>|null      $useStatements    The use statements.
-     * @param Factory\ClassNameFactoryInterface|null $factory          The class name factory to use.
+     * @param QualifiedClassNameInterface|null  $primaryNamespace The namespace.
+     * @param array<UseStatementInterface>|null $useStatements    The use statements.
+     * @param ClassNameFactoryInterface|null    $factory          The class name factory to use.
      */
     public function __construct(
         QualifiedClassNameInterface $primaryNamespace = null,
         array $useStatements = null,
-        Factory\ClassNameFactoryInterface $factory = null
+        ClassNameFactoryInterface $factory = null
     ) {
         if (null === $factory) {
-            $factory = new Factory\ClassNameFactory;
+            $factory = new ClassNameFactory;
         }
         if (null === $primaryNamespace) {
             $primaryNamespace = $factory->createFromAtoms(array(), true);
@@ -103,7 +109,7 @@ public function resolve(ClassNameReferenceInterface $reference)
     /**
      * Get the class name factory.
      *
-     * @return Factory\ClassNameFactoryInterface The class name factory.
+     * @return ClassNameFactoryInterface The class name factory.
      */
     public function factory()
     {
diff --git a/src/Eloquent/Cosmos/ClassName/ResolutionContextInterface.php b/src/Eloquent/Cosmos/Resolution/ResolutionContextInterface.php
similarity index 90%
rename from src/Eloquent/Cosmos/ClassName/ResolutionContextInterface.php
rename to src/Eloquent/Cosmos/Resolution/ResolutionContextInterface.php
index 12e5ace..f4e4cc4 100644
--- a/src/Eloquent/Cosmos/ClassName/ResolutionContextInterface.php
+++ b/src/Eloquent/Cosmos/Resolution/ResolutionContextInterface.php
@@ -9,7 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Eloquent\Cosmos\ClassName;
+namespace Eloquent\Cosmos\Resolution;
+
+use Eloquent\Cosmos\ClassName\ClassNameReferenceInterface;
 
 /**
  * The interface implemented by class name resolution contexts.
diff --git a/src/Eloquent/Cosmos/ClassName/UseStatement.php b/src/Eloquent/Cosmos/Resolution/UseStatement.php
similarity index 79%
rename from src/Eloquent/Cosmos/ClassName/UseStatement.php
rename to src/Eloquent/Cosmos/Resolution/UseStatement.php
index 149a528..e0dddde 100644
--- a/src/Eloquent/Cosmos/ClassName/UseStatement.php
+++ b/src/Eloquent/Cosmos/Resolution/UseStatement.php
@@ -9,7 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Eloquent\Cosmos\ClassName;
+namespace Eloquent\Cosmos\Resolution;
+
+use Eloquent\Cosmos\ClassName\ClassNameReferenceInterface;
+use Eloquent\Cosmos\ClassName\Exception\InvalidClassNameAtomException;
+use Eloquent\Cosmos\ClassName\QualifiedClassName;
+use Eloquent\Cosmos\ClassName\QualifiedClassNameInterface;
 
 /**
  * Represents a use statement.
@@ -22,7 +27,7 @@ class UseStatement implements UseStatementInterface
      * @param QualifiedClassNameInterface      $className The class name.
      * @param ClassNameReferenceInterface|null $alias     The alias for the class name.
      *
-     * @throws Exception\InvalidClassNameAtomException If an invalid alias is supplied.
+     * @throws InvalidClassNameAtomException If an invalid alias is supplied.
      */
     public function __construct(
         QualifiedClassNameInterface $className,
@@ -39,9 +44,7 @@ public function __construct(
                 QualifiedClassName::SELF_ATOM === $aliasAtoms[0] ||
                 QualifiedClassName::PARENT_ATOM === $aliasAtoms[0]
             ) {
-                throw new Exception\InvalidClassNameAtomException(
-                    $alias->string()
-                );
+                throw new InvalidClassNameAtomException($alias->string());
             }
 
             $this->alias = $normalizedAlias;
diff --git a/src/Eloquent/Cosmos/ClassName/UseStatementInterface.php b/src/Eloquent/Cosmos/Resolution/UseStatementInterface.php
similarity index 94%
rename from src/Eloquent/Cosmos/ClassName/UseStatementInterface.php
rename to src/Eloquent/Cosmos/Resolution/UseStatementInterface.php
index acc01c2..ad293d9 100644
--- a/src/Eloquent/Cosmos/ClassName/UseStatementInterface.php
+++ b/src/Eloquent/Cosmos/Resolution/UseStatementInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Eloquent\Cosmos\ClassName;
+namespace Eloquent\Cosmos\Resolution;
 
 /**
  * The interface implemented by use statements.
diff --git a/test/suite/Eloquent/Cosmos/ClassName/Resolver/BoundClassNameResolverTest.php b/test/suite/Eloquent/Cosmos/Resolution/BoundClassNameResolverTest.php
similarity index 94%
rename from test/suite/Eloquent/Cosmos/ClassName/Resolver/BoundClassNameResolverTest.php
rename to test/suite/Eloquent/Cosmos/Resolution/BoundClassNameResolverTest.php
index bafbef5..bd55ecf 100644
--- a/test/suite/Eloquent/Cosmos/ClassName/Resolver/BoundClassNameResolverTest.php
+++ b/test/suite/Eloquent/Cosmos/Resolution/BoundClassNameResolverTest.php
@@ -9,10 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Eloquent\Cosmos\ClassName\Resolver;
+namespace Eloquent\Cosmos\Resolution;
 
 use Eloquent\Cosmos\ClassName\Factory\ClassNameFactory;
-use Eloquent\Cosmos\ClassName\ResolutionContext;
 use PHPUnit_Framework_TestCase;
 
 class BoundClassNameResolverTest extends PHPUnit_Framework_TestCase
diff --git a/test/suite/Eloquent/Cosmos/ClassName/Resolver/ClassNameResolverTest.php b/test/suite/Eloquent/Cosmos/Resolution/ClassNameResolverTest.php
similarity index 91%
rename from test/suite/Eloquent/Cosmos/ClassName/Resolver/ClassNameResolverTest.php
rename to test/suite/Eloquent/Cosmos/Resolution/ClassNameResolverTest.php
index 8c121fc..9b09aa2 100644
--- a/test/suite/Eloquent/Cosmos/ClassName/Resolver/ClassNameResolverTest.php
+++ b/test/suite/Eloquent/Cosmos/Resolution/ClassNameResolverTest.php
@@ -9,10 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Eloquent\Cosmos\ClassName\Resolver;
+namespace Eloquent\Cosmos\Resolution;
 
 use Eloquent\Cosmos\ClassName\Factory\ClassNameFactory;
-use Eloquent\Cosmos\ClassName\ResolutionContext;
 use PHPUnit_Framework_TestCase;
 
 class ClassNameResolverTest extends PHPUnit_Framework_TestCase
diff --git a/test/suite/Eloquent/Cosmos/ClassName/Resolver/Consumer/ClassNameResolverTraitTest.php b/test/suite/Eloquent/Cosmos/Resolution/Consumer/ClassNameResolverTraitTest.php
similarity index 78%
rename from test/suite/Eloquent/Cosmos/ClassName/Resolver/Consumer/ClassNameResolverTraitTest.php
rename to test/suite/Eloquent/Cosmos/Resolution/Consumer/ClassNameResolverTraitTest.php
index 3def834..96462c3 100644
--- a/test/suite/Eloquent/Cosmos/ClassName/Resolver/Consumer/ClassNameResolverTraitTest.php
+++ b/test/suite/Eloquent/Cosmos/Resolution/Consumer/ClassNameResolverTraitTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Eloquent\Cosmos\ClassName\Resolver\Consumer;
+namespace Eloquent\Cosmos\Resolution\Consumer;
 
 use Phake;
 use PHPUnit_Framework_TestCase;
@@ -29,7 +29,7 @@ protected function setUp()
 
     public function testSetClassNameResolver()
     {
-        $classNameResolver = Phake::mock('Eloquent\Cosmos\ClassName\Resolver\ClassNameResolverInterface');
+        $classNameResolver = Phake::mock('Eloquent\Cosmos\Resolution\ClassNameResolverInterface');
         $this->consumer->setClassNameResolver($classNameResolver);
 
         $this->assertSame($classNameResolver, $this->consumer->classNameResolver());
@@ -39,7 +39,7 @@ public function testClassNameResolver()
     {
         $classNameResolver = $this->consumer->classNameResolver();
 
-        $this->assertInstanceOf('Eloquent\Cosmos\ClassName\Resolver\ClassNameResolverInterface', $classNameResolver);
+        $this->assertInstanceOf('Eloquent\Cosmos\Resolution\ClassNameResolverInterface', $classNameResolver);
         $this->assertSame($classNameResolver, $this->consumer->classNameResolver());
     }
 }
diff --git a/test/suite/Eloquent/Cosmos/ClassName/ResolutionContextTest.php b/test/suite/Eloquent/Cosmos/Resolution/ResolutionContextTest.php
similarity index 94%
rename from test/suite/Eloquent/Cosmos/ClassName/ResolutionContextTest.php
rename to test/suite/Eloquent/Cosmos/Resolution/ResolutionContextTest.php
index eeb7cd9..446ae39 100644
--- a/test/suite/Eloquent/Cosmos/ClassName/ResolutionContextTest.php
+++ b/test/suite/Eloquent/Cosmos/Resolution/ResolutionContextTest.php
@@ -9,8 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Eloquent\Cosmos\ClassName;
+namespace Eloquent\Cosmos\Resolution;
 
+use Eloquent\Cosmos\ClassName\Factory\ClassNameFactory;
+use Eloquent\Cosmos\ClassName\QualifiedClassName;
 use PHPUnit_Framework_TestCase;
 
 class ResolutionContextTest extends PHPUnit_Framework_TestCase
@@ -19,7 +21,7 @@ protected function setUp()
     {
         parent::setUp();
 
-        $this->factory = new Factory\ClassNameFactory;
+        $this->factory = new ClassNameFactory;
         $this->primaryNamespace = $this->factory->create('\VendorA\PackageA');
         $this->useStatements = array(
             new UseStatement($this->factory->create('\VendorB\PackageB')),
diff --git a/test/suite/Eloquent/Cosmos/ClassName/UseStatementTest.php b/test/suite/Eloquent/Cosmos/Resolution/UseStatementTest.php
similarity index 93%
rename from test/suite/Eloquent/Cosmos/ClassName/UseStatementTest.php
rename to test/suite/Eloquent/Cosmos/Resolution/UseStatementTest.php
index 6b032c2..237a986 100644
--- a/test/suite/Eloquent/Cosmos/ClassName/UseStatementTest.php
+++ b/test/suite/Eloquent/Cosmos/Resolution/UseStatementTest.php
@@ -9,8 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Eloquent\Cosmos\ClassName;
+namespace Eloquent\Cosmos\Resolution;
 
+use Eloquent\Cosmos\ClassName\Factory\ClassNameFactory;
 use PHPUnit_Framework_TestCase;
 
 class UseStatementTest extends PHPUnit_Framework_TestCase
@@ -19,7 +20,7 @@ protected function setUp()
     {
         parent::setUp();
 
-        $this->factory = new Factory\ClassNameFactory;
+        $this->factory = new ClassNameFactory;
         $this->className = $this->factory->create('\\Namespace\\Class');
         $this->alias = $this->factory->create('Alias');
         $this->useStatement = new UseStatement($this->className, $this->alias);