diff --git a/.phpunit.result.cache b/.phpunit.result.cache
index 1e989a4..7d3f013 100644
--- a/.phpunit.result.cache
+++ b/.phpunit.result.cache
@@ -1 +1 @@
-{"version":1,"defects":{"Tests\\DefaultPoolExecutorTest::testTaskExecution":4},"times":{"Tests\\PoolExecutorTest::testBlockingQueue":0.011,"Tests\\PoolExecutorTest::testTaskExecution":0.01,"Tests\\DefaultPoolExecutorTest::testBlockingQueue":0.015,"Tests\\DefaultPoolExecutorTest::testTaskExecution":0.038}}
\ No newline at end of file
+{"version":1,"defects":{"Tests\\DefaultPoolExecutorTest::testTaskExecution":4},"times":{"Tests\\PoolExecutorTest::testBlockingQueue":0.011,"Tests\\PoolExecutorTest::testTaskExecution":0.01,"Tests\\DefaultPoolExecutorTest::testBlockingQueue":0.012,"Tests\\DefaultPoolExecutorTest::testTaskExecution":0.013}}
\ No newline at end of file
diff --git a/src/Executor/DefaultPoolExecutor.php b/src/Executor/DefaultPoolExecutor.php
index 8ab5c3d..7bdc846 100644
--- a/src/Executor/DefaultPoolExecutor.php
+++ b/src/Executor/DefaultPoolExecutor.php
@@ -7,7 +7,7 @@
     RunnableInterface,
     ThreadInterface
 };
-use Concurrent\Time\TimeUnit;
+use Concurrent\TimeUnit;
 use Concurrent\Queue\ArrayBlockingQueue;
 use Concurrent\Worker\WorkerFactory;
 
diff --git a/src/Queue/ArrayBlockingQueue.php b/src/Queue/ArrayBlockingQueue.php
index 8639f8d..c2c079d 100644
--- a/src/Queue/ArrayBlockingQueue.php
+++ b/src/Queue/ArrayBlockingQueue.php
@@ -2,7 +2,10 @@
 
 namespace Concurrent\Queue;
 
-use Concurrent\ThreadInterface;
+use Concurrent\{
+    ThreadInterface,
+    TimeUnit
+};
 
 class ArrayBlockingQueue extends AbstractQueue implements BlockingQueueInterface
 {
diff --git a/src/Time/TimerTask.php b/src/Task/TimerTask.php
similarity index 96%
rename from src/Time/TimerTask.php
rename to src/Task/TimerTask.php
index a8b030c..752f710 100644
--- a/src/Time/TimerTask.php
+++ b/src/Task/TimerTask.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Concurrent\Time;
+namespace Concurrent\Task;
+
+use Concurrent\RunnableInterface;
 
 abstract class TimerTask implements RunnableInterface
 {
diff --git a/src/Time/TimeUnit.php b/src/TimeUnit.php
similarity index 97%
rename from src/Time/TimeUnit.php
rename to src/TimeUnit.php
index a6bf964..373d16c 100644
--- a/src/Time/TimeUnit.php
+++ b/src/TimeUnit.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Concurrent\Time;
+namespace Concurrent;
 
 class TimeUnit
 {
diff --git a/tests/DefaultPoolExecutorTest.php b/tests/DefaultPoolExecutorTest.php
index 14ba033..7ff238d 100644
--- a/tests/DefaultPoolExecutorTest.php
+++ b/tests/DefaultPoolExecutorTest.php
@@ -3,9 +3,9 @@
 namespace Tests;
 
 use PHPUnit\Framework\TestCase;
-use Concurrent\Queue\ArrayBlockingQueue;
-use Concurrent\Time\TimeUnit;
 use Concurrent\Executor\DefaultPoolExecutor;
+use Concurrent\Queue\ArrayBlockingQueue;
+use Concurrent\TimeUnit;
 
 class DefaultPoolExecutorTest extends TestCase
 {