diff --git a/src/Builder/DefaultUuidBuilder.php b/src/Builder/DefaultUuidBuilder.php
index 449e68b..b8892e7 100644
--- a/src/Builder/DefaultUuidBuilder.php
+++ b/src/Builder/DefaultUuidBuilder.php
@@ -2,7 +2,7 @@
 
 namespace Rhumsaa\Uuid\Builder;
 
-use Rhumsaa\Uuid\BigNumberConverter;
+use Rhumsaa\Uuid\Converter\NumberConverterInterface;
 use Rhumsaa\Uuid\Codec;
 use Rhumsaa\Uuid\Uuid;
 use Rhumsaa\Uuid\UuidBuilder;
@@ -12,7 +12,7 @@ class DefaultUuidBuilder implements UuidBuilder
 
     private $converter;
 
-    public function __construct(BigNumberConverter $converter)
+    public function __construct(NumberConverterInterface $converter)
     {
         $this->converter = $converter;
     }
diff --git a/src/Builder/DegradedUuidBuilder.php b/src/Builder/DegradedUuidBuilder.php
index 8de0218..d5a345e 100644
--- a/src/Builder/DegradedUuidBuilder.php
+++ b/src/Builder/DegradedUuidBuilder.php
@@ -5,14 +5,14 @@ namespace Rhumsaa\Uuid\Builder;
 use Rhumsaa\Uuid\UuidBuilder;
 use Rhumsaa\Uuid\Codec;
 use Rhumsaa\Uuid\DegradedUuid;
-use Rhumsaa\Uuid\BigNumberConverter;
+use Rhumsaa\Uuid\Converter\NumberConverterInterface;
 
 class DegradedUuidBuilder implements UuidBuilder
 {
 
     private $converter;
 
-    public function __construct(BigNumberConverter $converter)
+    public function __construct(NumberConverterInterface $converter)
     {
         $this->converter = $converter;
     }
diff --git a/src/BigNumberConverter.php b/src/Converter/Number/BigNumberConverter.php
similarity index 75%
rename from src/BigNumberConverter.php
rename to src/Converter/Number/BigNumberConverter.php
index 97551cf..31189be 100644
--- a/src/BigNumberConverter.php
+++ b/src/Converter/Number/BigNumberConverter.php
@@ -1,8 +1,10 @@
 <?php
 
-namespace Rhumsaa\Uuid;
+namespace Rhumsaa\Uuid\Converter\Number;
 
-class BigNumberConverter
+use Rhumsaa\Uuid\Converter\NumberConverterInterface;
+
+class BigNumberConverter implements NumberConverterInterface
 {
     /**
      * @param string $hex
diff --git a/src/DegradedNumberConverter.php b/src/Converter/Number/DegradedNumberConverter.php
similarity index 63%
rename from src/DegradedNumberConverter.php
rename to src/Converter/Number/DegradedNumberConverter.php
index 7950cca..9e6da9f 100644
--- a/src/DegradedNumberConverter.php
+++ b/src/Converter/Number/DegradedNumberConverter.php
@@ -1,12 +1,15 @@
 <?php
 
-namespace Rhumsaa\Uuid;
+namespace Rhumsaa\Uuid\Converter\Number;
 
-class DegradedNumberConverter extends BigNumberConverter
+use Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException;
+use Rhumsaa\Uuid\Converter\NumberConverterInterface;
+
+class DegradedNumberConverter extends BigNumberConverter implements NumberConverterInterface
 {
     public function fromHex($hex)
     {
-        throw new Exception\UnsatisfiedDependencyException(
+        throw new UnsatisfiedDependencyException(
             'Cannot call ' . __METHOD__ . ' without support for large '
             . 'integers, since integer is an unsigned '
             . '128-bit integer; Moontoast\Math\BigNumber is required.'
@@ -16,7 +19,7 @@ class DegradedNumberConverter extends BigNumberConverter
 
     public function toHex($integer)
     {
-        throw new Exception\UnsatisfiedDependencyException(
+        throw new UnsatisfiedDependencyException(
             'Cannot call ' . __METHOD__ . ' without support for large '
             . 'integers, since integer is an unsigned '
             . '128-bit integer; Moontoast\Math\BigNumber is required. '
diff --git a/src/Converter/NumberConverterInterface.php b/src/Converter/NumberConverterInterface.php
new file mode 100644
index 0000000..5a3ae89
--- /dev/null
+++ b/src/Converter/NumberConverterInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Rhumsaa\Uuid\Converter;
+
+interface NumberConverterInterface
+{
+    public function fromHex($hex);
+
+    public function toHex($integer);
+} 
\ No newline at end of file
diff --git a/src/Time/BigNumberTimeConverter.php b/src/Converter/Time/BigNumberTimeConverter.php
similarity index 81%
rename from src/Time/BigNumberTimeConverter.php
rename to src/Converter/Time/BigNumberTimeConverter.php
index a09670c..dd7f911 100644
--- a/src/Time/BigNumberTimeConverter.php
+++ b/src/Converter/Time/BigNumberTimeConverter.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Rhumsaa\Uuid\Time;
+namespace Rhumsaa\Uuid\Converter\Time;
 
-use Rhumsaa\Uuid\TimeConverter;
+use Rhumsaa\Uuid\Converter\TimeConverterInterface;
 
-class BigNumberTimeConverter implements TimeConverter
+class BigNumberTimeConverter implements TimeConverterInterface
 {
     public function calculateTime($seconds, $microSeconds)
     {
diff --git a/src/Time/DegradedTimeConverter.php b/src/Converter/Time/DegradedTimeConverter.php
similarity index 71%
rename from src/Time/DegradedTimeConverter.php
rename to src/Converter/Time/DegradedTimeConverter.php
index f64ee30..c482ee4 100644
--- a/src/Time/DegradedTimeConverter.php
+++ b/src/Converter/Time/DegradedTimeConverter.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Rhumsaa\Uuid\Time;
+namespace Rhumsaa\Uuid\Converter\Time;
 
-use Rhumsaa\Uuid\TimeConverter;
+use Rhumsaa\Uuid\Converter\TimeConverterInterface;
 use Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException;
 
-class DegradedTimeConverter implements TimeConverter
+class DegradedTimeConverter implements TimeConverterInterface
 {
     public function calculateTime($seconds, $microSeconds)
     {
diff --git a/src/Time/PhpTimeConverter.php b/src/Converter/Time/PhpTimeConverter.php
similarity index 79%
rename from src/Time/PhpTimeConverter.php
rename to src/Converter/Time/PhpTimeConverter.php
index 5e40540..f433401 100644
--- a/src/Time/PhpTimeConverter.php
+++ b/src/Converter/Time/PhpTimeConverter.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Rhumsaa\Uuid\Time;
+namespace Rhumsaa\Uuid\Converter\Time;
 
-use Rhumsaa\Uuid\TimeConverter;
+use Rhumsaa\Uuid\Converter\TimeConverterInterface;
 
-class PhpTimeConverter implements TimeConverter
+class PhpTimeConverter implements TimeConverterInterface
 {
     public function calculateTime($seconds, $microSeconds)
     {
diff --git a/src/TimeConverter.php b/src/Converter/TimeConverterInterface.php
similarity index 81%
rename from src/TimeConverter.php
rename to src/Converter/TimeConverterInterface.php
index 688f200..2f4c397 100644
--- a/src/TimeConverter.php
+++ b/src/Converter/TimeConverterInterface.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Rhumsaa\Uuid;
+namespace Rhumsaa\Uuid\Converter;
 
-interface TimeConverter
+interface TimeConverterInterface
 {
 
     /**
diff --git a/src/DegradedUuid.php b/src/DegradedUuid.php
index 7f11acc..9c9ff80 100644
--- a/src/DegradedUuid.php
+++ b/src/DegradedUuid.php
@@ -2,10 +2,12 @@
 
 namespace Rhumsaa\Uuid;
 
+use Rhumsaa\Uuid\Converter\NumberConverterInterface;
+
 class DegradedUuid extends Uuid
 {
 
-    public function __construct(array $fields, BigNumberConverter $converter, Codec $codec)
+    public function __construct(array $fields, NumberConverterInterface $converter, Codec $codec)
     {
         parent::__construct($fields, $converter, $codec);
     }
diff --git a/src/FeatureSet.php b/src/FeatureSet.php
index bd6c31e..cfbc8ba 100644
--- a/src/FeatureSet.php
+++ b/src/FeatureSet.php
@@ -5,9 +5,11 @@ namespace Rhumsaa\Uuid;
 use Rhumsaa\Uuid\Node\FallbackNodeProvider;
 use Rhumsaa\Uuid\Node\RandomNodeProvider;
 use Rhumsaa\Uuid\Node\SystemNodeProvider;
-use Rhumsaa\Uuid\Time\BigNumberTimeConverter;
-use Rhumsaa\Uuid\Time\DegradedTimeConverter;
-use Rhumsaa\Uuid\Time\PhpTimeConverter;
+use Rhumsaa\Uuid\Converter\Number\BigNumberConverter;
+use Rhumsaa\Uuid\Converter\Number\DegradedNumberConverter;
+use Rhumsaa\Uuid\Converter\Time\BigNumberTimeConverter;
+use Rhumsaa\Uuid\Converter\Time\DegradedTimeConverter;
+use Rhumsaa\Uuid\Converter\Time\PhpTimeConverter;
 use Rhumsaa\Uuid\Time\SystemTimeProvider;
 use Rhumsaa\Uuid\Builder\DefaultUuidBuilder;
 use Rhumsaa\Uuid\Codec\StringCodec;
diff --git a/src/Uuid.php b/src/Uuid.php
index ab0c5ca..75acb84 100644
--- a/src/Uuid.php
+++ b/src/Uuid.php
@@ -12,6 +12,7 @@
 namespace Rhumsaa\Uuid;
 
 use InvalidArgumentException;
+use Rhumsaa\Uuid\Converter\NumberConverterInterface;
 
 /**
  * Represents a universally unique identifier (UUID), according to RFC 4122
@@ -137,7 +138,7 @@ class Uuid implements UuidInterface, \JsonSerializable
      * @param Codec $codec String codec
      * @link Rhumsaa.Uuid.Uuid.html#method_getFields
      */
-    public function __construct(array $fields, BigNumberConverter $converter, Codec $codec)
+    public function __construct(array $fields, NumberConverterInterface $converter, Codec $codec)
     {
         $this->fields = $fields;
         $this->codec = $codec;
@@ -303,7 +304,7 @@ class Uuid implements UuidInterface, \JsonSerializable
         return sprintf('%04x', $this->getClockSequence());
     }
 
-    public function getConverter()
+    public function getNumberConverter()
     {
         return $this->converter;
     }
diff --git a/src/UuidFactory.php b/src/UuidFactory.php
index 5df3116..511260b 100644
--- a/src/UuidFactory.php
+++ b/src/UuidFactory.php
@@ -2,6 +2,10 @@
 
 namespace Rhumsaa\Uuid;
 
+use InvalidArgumentException;
+use Rhumsaa\Uuid\Converter\NumberConverterInterface;
+use Rhumsaa\Uuid\Converter\TimeConverterInterface;
+
 class UuidFactory
 {
 
@@ -19,7 +23,7 @@ class UuidFactory
 
     /**
      *
-     * @var BigNumberConverter
+     * @var NumberConverterInterface
      */
     private $numberConverter = null;
 
@@ -30,7 +34,7 @@ class UuidFactory
 
     /**
      *
-     * @var TimeConverter
+     * @var TimeConverterInterface
      */
     private $timeConverter = null;
 
@@ -68,7 +72,7 @@ class UuidFactory
         return $this->codec;
     }
 
-    public function setTimeConverter(TimeConverter $converter)
+    public function setTimeConverter(TimeConverterInterface $converter)
     {
         $this->timeConverter = $converter;
     }
@@ -88,7 +92,7 @@ class UuidFactory
         $this->nodeProvider = $provider;
     }
 
-    public function setNumberConverter(BigNumberConverter $converter)
+    public function setNumberConverter(NumberConverterInterface $converter)
     {
         $this->numberConverter = $converter;
     }
diff --git a/src/UuidInterface.php b/src/UuidInterface.php
index 4e852e2..20ba807 100644
--- a/src/UuidInterface.php
+++ b/src/UuidInterface.php
@@ -2,6 +2,8 @@
 
 namespace Rhumsaa\Uuid;
 
+use Rhumsaa\Uuid\Converter\NumberConverterInterface;
+
 interface UuidInterface
 {
 
@@ -16,9 +18,9 @@ interface UuidInterface
     public function equals($other);
 
     /**
-     * @return BigNumberConverter
+     * @return NumberConverterInterface
      */
-    public function getConverter();
+    public function getNumberConverter();
 
     /**
      * @return string
diff --git a/tests/DegradedNumberConverterTest.php b/tests/Converter/Number/DegradedNumberConverterTest.php
similarity index 89%
rename from tests/DegradedNumberConverterTest.php
rename to tests/Converter/Number/DegradedNumberConverterTest.php
index 8f14ceb..0ebef84 100644
--- a/tests/DegradedNumberConverterTest.php
+++ b/tests/Converter/Number/DegradedNumberConverterTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Rhumsaa\Uuid;
+namespace Rhumsaa\Uuid\Converter\Number;
+
+use Rhumsaa\Uuid\TestCase;
 
 class DegradedNumberConverterTest extends TestCase
 {
diff --git a/tests/UuidTest.php b/tests/UuidTest.php
index 2372b2c..eb6e410 100644
--- a/tests/UuidTest.php
+++ b/tests/UuidTest.php
@@ -187,7 +187,7 @@ class UuidTest extends TestCase
         $uuid = Uuid::fromString('ff6f8cb0-c57d-11e1-9b21-0800200c9a66');
 
         $this->assertInstanceOf('Rhumsaa\Uuid\DegradedUuid', $uuid);
-        $this->assertInstanceOf('Rhumsaa\Uuid\DegradedNumberConverter', $uuid->getConverter());
+        $this->assertInstanceOf('Rhumsaa\Uuid\Converter\Number\DegradedNumberConverter', $uuid->getNumberConverter());
 
         $date = $uuid->getDateTime();
     }
@@ -1687,7 +1687,7 @@ class UuidTest extends TestCase
 
     /**
      * @expectedException Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException
-     * @expectedExceptionMessage Cannot call Rhumsaa\Uuid\DegradedNumberConverter::fromHex without support for large integers
+     * @expectedExceptionMessage Cannot call Rhumsaa\Uuid\Converter\Number\DegradedNumberConverter::fromHex without support for large integers
      */
     public function testGetInteger()
     {