diff --git a/src/Builder/DefaultUuidBuilder.php b/src/Builder/DefaultUuidBuilder.php
index b92a36e..29dc1bd 100644
--- a/src/Builder/DefaultUuidBuilder.php
+++ b/src/Builder/DefaultUuidBuilder.php
@@ -15,7 +15,7 @@
 namespace Ramsey\Uuid\Builder;
 
 use Ramsey\Uuid\Converter\NumberConverterInterface;
-use Ramsey\Uuid\CodecInterface;
+use Ramsey\Uuid\Codec\CodecInterface;
 use Ramsey\Uuid\Uuid;
 use Ramsey\Uuid\UuidBuilder;
 
diff --git a/src/Builder/DegradedUuidBuilder.php b/src/Builder/DegradedUuidBuilder.php
index c171956..c1a0797 100644
--- a/src/Builder/DegradedUuidBuilder.php
+++ b/src/Builder/DegradedUuidBuilder.php
@@ -15,7 +15,7 @@
 namespace Ramsey\Uuid\Builder;
 
 use Ramsey\Uuid\UuidBuilder;
-use Ramsey\Uuid\CodecInterface;
+use Ramsey\Uuid\Codec\CodecInterface;
 use Ramsey\Uuid\DegradedUuid;
 use Ramsey\Uuid\Converter\NumberConverterInterface;
 
diff --git a/src/CodecInterface.php b/src/Codec/CodecInterface.php
similarity index 93%
rename from src/CodecInterface.php
rename to src/Codec/CodecInterface.php
index 218df42..be0c6df 100644
--- a/src/CodecInterface.php
+++ b/src/Codec/CodecInterface.php
@@ -12,7 +12,9 @@
  * @link https://github.com/ramsey/uuid GitHub
  */
 
-namespace Ramsey\Uuid;
+namespace Ramsey\Uuid\Codec;
+
+use Ramsey\Uuid\UuidInterface;
 
 interface CodecInterface
 {
diff --git a/src/Codec/GuidStringCodec.php b/src/Codec/GuidStringCodec.php
index 67b86ad..4444d87 100644
--- a/src/Codec/GuidStringCodec.php
+++ b/src/Codec/GuidStringCodec.php
@@ -16,7 +16,6 @@ namespace Ramsey\Uuid\Codec;
 
 use Ramsey\Uuid\UuidInterface;
 use Ramsey\Uuid\Uuid;
-use Ramsey\Uuid\CodecInterface;
 
 class GuidStringCodec extends StringCodec
 {
diff --git a/src/Codec/StringCodec.php b/src/Codec/StringCodec.php
index cac8845..80313a4 100644
--- a/src/Codec/StringCodec.php
+++ b/src/Codec/StringCodec.php
@@ -15,7 +15,6 @@
 namespace Ramsey\Uuid\Codec;
 
 use InvalidArgumentException;
-use Ramsey\Uuid\CodecInterface;
 use Ramsey\Uuid\Uuid;
 use Ramsey\Uuid\UuidBuilder;
 use Ramsey\Uuid\UuidInterface;
diff --git a/src/DegradedUuid.php b/src/DegradedUuid.php
index 5a7c6c9..0ad4fc6 100644
--- a/src/DegradedUuid.php
+++ b/src/DegradedUuid.php
@@ -15,6 +15,7 @@
 namespace Ramsey\Uuid;
 
 use Ramsey\Uuid\Converter\NumberConverterInterface;
+use Ramsey\Uuid\Codec\CodecInterface;
 
 class DegradedUuid extends Uuid
 {
diff --git a/src/Uuid.php b/src/Uuid.php
index cdc6bf7..49623e3 100644
--- a/src/Uuid.php
+++ b/src/Uuid.php
@@ -16,6 +16,7 @@ namespace Ramsey\Uuid;
 
 use InvalidArgumentException;
 use Ramsey\Uuid\Converter\NumberConverterInterface;
+use Ramsey\Uuid\Codec\CodecInterface;
 
 /**
  * Represents a universally unique identifier (UUID), according to RFC 4122
diff --git a/src/UuidBuilder.php b/src/UuidBuilder.php
index 0e61e87..1954516 100644
--- a/src/UuidBuilder.php
+++ b/src/UuidBuilder.php
@@ -14,6 +14,8 @@
 
 namespace Ramsey\Uuid;
 
+use Ramsey\Uuid\Codec\CodecInterface;
+
 interface UuidBuilder
 {
     /**
diff --git a/src/UuidFactory.php b/src/UuidFactory.php
index 2f9e532..c9b2a13 100644
--- a/src/UuidFactory.php
+++ b/src/UuidFactory.php
@@ -20,6 +20,7 @@ use Ramsey\Uuid\Converter\TimeConverterInterface;
 use Ramsey\Uuid\Provider\NodeProviderInterface;
 use Ramsey\Uuid\Provider\TimeProviderInterface;
 use Ramsey\Uuid\Generator\RandomGeneratorInterface;
+use Ramsey\Uuid\Codec\CodecInterface;
 
 class UuidFactory implements UuidFactoryInterface
 {