diff --git a/spec/BenGorFile/SimpleBusBridge/Application/SimpleBusFileCommandBusSpec.php b/spec/BenGorFile/SimpleBusBridge/CommanBus/SimpleBusFileCommandBusSpec.php
similarity index 95%
rename from spec/BenGorFile/SimpleBusBridge/Application/SimpleBusFileCommandBusSpec.php
rename to spec/BenGorFile/SimpleBusBridge/CommanBus/SimpleBusFileCommandBusSpec.php
index 5c0dd7b..d6f7fde 100644
--- a/spec/BenGorFile/SimpleBusBridge/Application/SimpleBusFileCommandBusSpec.php
+++ b/spec/BenGorFile/SimpleBusBridge/CommanBus/SimpleBusFileCommandBusSpec.php
@@ -13,7 +13,7 @@
 namespace spec\BenGorFile\SimpleBusBridge\CommandBus;
 
 use BenGorFile\File\Application\Command\Upload\UploadFileCommand;
-use BenGorFile\File\Infrastructure\CommandBus\FileCommandBus;
+use BenGorFile\File\Infrastructure\Application\FileCommandBus;
 use BenGorFile\SimpleBusBridge\CommandBus\SimpleBusFileCommandBus;
 use PhpSpec\ObjectBehavior;
 use SimpleBus\Message\Bus\MessageBus;
diff --git a/spec/BenGorFile/SimpleBusBridge/Application/SimpleBusFileQueryBusSpec.php b/spec/BenGorFile/SimpleBusBridge/CommanBus/SimpleBusFileQueryBusSpec.php
similarity index 100%
rename from spec/BenGorFile/SimpleBusBridge/Application/SimpleBusFileQueryBusSpec.php
rename to spec/BenGorFile/SimpleBusBridge/CommanBus/SimpleBusFileQueryBusSpec.php
diff --git a/src/BenGorFile/SimpleBusBridge/Application/SimpleBusFileCommandBus.php b/src/BenGorFile/SimpleBusBridge/CommandBus/SimpleBusFileCommandBus.php
similarity index 100%
rename from src/BenGorFile/SimpleBusBridge/Application/SimpleBusFileCommandBus.php
rename to src/BenGorFile/SimpleBusBridge/CommandBus/SimpleBusFileCommandBus.php
diff --git a/src/BenGorFile/SimpleBusBridge/Application/SimpleBusFileQueryBus.php b/src/BenGorFile/SimpleBusBridge/CommandBus/SimpleBusFileQueryBus.php
similarity index 100%
rename from src/BenGorFile/SimpleBusBridge/Application/SimpleBusFileQueryBus.php
rename to src/BenGorFile/SimpleBusBridge/CommandBus/SimpleBusFileQueryBus.php