diff --git a/composer.json b/composer.json
index 6452546..8012546 100644
--- a/composer.json
+++ b/composer.json
@@ -15,6 +15,7 @@
         "enqueue/null": "^0.10",
         "league/tactician-bundle": "^1.1",
         "league/tactician-command-events": "^0.6.0",
+        "micro-module/base": "^0.4.0",
         "psr/log": "^1.1"
     },
     "require-dev": {
diff --git a/docker-compose.yml b/docker-compose.yml
index 42158bd..609c0dd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,5 +8,5 @@ services:
       context: .docker/php7.3-dev
     volumes:
       - ~/.composer/cache/:/.composer_cache/:rw
-      - ..:/packages:rw
-    working_dir: /packages/Task
+      - .:/app:rw
+    working_dir: /app
diff --git a/src/Application/EventListener/JobCommandBusEventListenerInterface.php b/src/Application/EventListener/JobCommandBusEventListenerInterface.php
index 9269148..36828eb 100644
--- a/src/Application/EventListener/JobCommandBusEventListenerInterface.php
+++ b/src/Application/EventListener/JobCommandBusEventListenerInterface.php
@@ -4,7 +4,7 @@
 
 namespace MicroModule\Task\Application\EventListener;
 
-use MicroModule\Base\Application\Command\CommandInterface;
+use MicroModule\Base\Domain\Command\CommandInterface;
 use Interop\Queue\Message;
 
 /**
diff --git a/src/Application/Processor/JobCommandBusProcessor.php b/src/Application/Processor/JobCommandBusProcessor.php
index 03c0694..222a28e 100644
--- a/src/Application/Processor/JobCommandBusProcessor.php
+++ b/src/Application/Processor/JobCommandBusProcessor.php
@@ -4,8 +4,8 @@
 
 namespace MicroModule\Task\Application\Processor;
 
-use MicroModule\Base\Application\Command\CommandInterface;
-use MicroModule\Base\Application\Factory\CommandFactoryInterface;
+use MicroModule\Base\Domain\Command\CommandInterface;
+use MicroModule\Base\Domain\Factory\CommandFactoryInterface;
 use MicroModule\Base\Utils\LoggerTrait;
 use MicroModule\Task\Application\EventListener\JobCommandBusEventListenerInterface;
 use Assert\Assertion;
diff --git a/tests/unit/Application/Processor/JobCommandBusProcessorTest.php b/tests/unit/Application/Processor/JobCommandBusProcessorTest.php
index e236ae5..183e3c8 100644
--- a/tests/unit/Application/Processor/JobCommandBusProcessorTest.php
+++ b/tests/unit/Application/Processor/JobCommandBusProcessorTest.php
@@ -4,8 +4,8 @@
 
 namespace MicroModule\Task\Tests\Unit\Application\Processor;
 
-use MicroModule\Base\Application\Command\CommandInterface;
-use MicroModule\Base\Application\Factory\CommandFactoryInterface;
+use MicroModule\Base\Domain\Command\CommandInterface;
+use MicroModule\Base\Domain\Factory\CommandFactoryInterface;
 use MicroModule\Task\Application\Processor\JobCommandBusProcessor;
 use MicroModule\Task\Infrastructure\Service\Test\JobRunner;
 use Broadway\EventDispatcher\Testing\TraceableEventDispatcher;