diff --git a/spec/Command/CreateAddressSpec.php b/spec/Command/AddressBook/CreateAddressSpec.php
similarity index 94%
rename from spec/Command/CreateAddressSpec.php
rename to spec/Command/AddressBook/CreateAddressSpec.php
index b8f163ccf..ecdb797ea 100644
--- a/spec/Command/CreateAddressSpec.php
+++ b/spec/Command/AddressBook/CreateAddressSpec.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\ShopApiPlugin\Command;
+namespace spec\Sylius\ShopApiPlugin\Command\AddressBook;
 
 use PhpSpec\ObjectBehavior;
 use Sylius\ShopApiPlugin\Model\Address;
diff --git a/spec/Command/RemoveAddressSpec.php b/spec/Command/AddressBook/RemoveAddressSpec.php
similarity index 88%
rename from spec/Command/RemoveAddressSpec.php
rename to spec/Command/AddressBook/RemoveAddressSpec.php
index 7de5b7d25..e62d71c41 100644
--- a/spec/Command/RemoveAddressSpec.php
+++ b/spec/Command/AddressBook/RemoveAddressSpec.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\ShopApiPlugin\Command;
+namespace spec\Sylius\ShopApiPlugin\Command\AddressBook;
 
 use PhpSpec\ObjectBehavior;
 
diff --git a/spec/Command/SetDefaultAddressSpec.php b/spec/Command/AddressBook/SetDefaultAddressSpec.php
similarity index 88%
rename from spec/Command/SetDefaultAddressSpec.php
rename to spec/Command/AddressBook/SetDefaultAddressSpec.php
index 258ecbc62..2880f8a85 100644
--- a/spec/Command/SetDefaultAddressSpec.php
+++ b/spec/Command/AddressBook/SetDefaultAddressSpec.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\ShopApiPlugin\Command;
+namespace spec\Sylius\ShopApiPlugin\Command\AddressBook;
 
 use PhpSpec\ObjectBehavior;
 
diff --git a/spec/Command/UpdateAddressSpec.php b/spec/Command/AddressBook/UpdateAddressSpec.php
similarity index 94%
rename from spec/Command/UpdateAddressSpec.php
rename to spec/Command/AddressBook/UpdateAddressSpec.php
index e5efc94e1..c4a1e65c5 100644
--- a/spec/Command/UpdateAddressSpec.php
+++ b/spec/Command/AddressBook/UpdateAddressSpec.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\ShopApiPlugin\Command;
+namespace spec\Sylius\ShopApiPlugin\Command\AddressBook;
 
 use PhpSpec\ObjectBehavior;
-use Sylius\ShopApiPlugin\Command\UpdateAddress;
+use Sylius\ShopApiPlugin\Command\AddressBook\UpdateAddress;
 use Sylius\ShopApiPlugin\Model\Address;
 
 final class UpdateAddressSpec extends ObjectBehavior
diff --git a/spec/Command/AddCouponSpec.php b/spec/Command/Cart/AddCouponSpec.php
similarity index 94%
rename from spec/Command/AddCouponSpec.php
rename to spec/Command/Cart/AddCouponSpec.php
index b49117000..c1f6067e3 100644
--- a/spec/Command/AddCouponSpec.php
+++ b/spec/Command/Cart/AddCouponSpec.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\ShopApiPlugin\Command;
+namespace spec\Sylius\ShopApiPlugin\Command\Cart;
 
 use PhpSpec\ObjectBehavior;
 use TypeError;
diff --git a/spec/Command/AddressOrderSpec.php b/spec/Command/Cart/AddressOrderSpec.php
similarity index 98%
rename from spec/Command/AddressOrderSpec.php
rename to spec/Command/Cart/AddressOrderSpec.php
index 258a2805d..8c884794b 100644
--- a/spec/Command/AddressOrderSpec.php
+++ b/spec/Command/Cart/AddressOrderSpec.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\ShopApiPlugin\Command;
+namespace spec\Sylius\ShopApiPlugin\Command\Cart;
 
 use PhpSpec\ObjectBehavior;
 use Sylius\ShopApiPlugin\Model\Address;
diff --git a/spec/Command/ChangeItemQuantitySpec.php b/spec/Command/Cart/ChangeItemQuantitySpec.php
similarity index 95%
rename from spec/Command/ChangeItemQuantitySpec.php
rename to spec/Command/Cart/ChangeItemQuantitySpec.php
index 52fc04f4d..0349a8dd2 100644
--- a/spec/Command/ChangeItemQuantitySpec.php
+++ b/spec/Command/Cart/ChangeItemQuantitySpec.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\ShopApiPlugin\Command;
+namespace spec\Sylius\ShopApiPlugin\Command\Cart;
 
 use InvalidArgumentException;
 use PhpSpec\ObjectBehavior;
diff --git a/spec/Command/ChoosePaymentMethodSpec.php b/spec/Command/Cart/ChoosePaymentMethodSpec.php
similarity index 95%
rename from spec/Command/ChoosePaymentMethodSpec.php
rename to spec/Command/Cart/ChoosePaymentMethodSpec.php
index 79793b383..d00bba5c0 100644
--- a/spec/Command/ChoosePaymentMethodSpec.php
+++ b/spec/Command/Cart/ChoosePaymentMethodSpec.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\ShopApiPlugin\Command;
+namespace spec\Sylius\ShopApiPlugin\Command\Cart;
 
 use PhpSpec\ObjectBehavior;
 use TypeError;
diff --git a/spec/Command/ChooseShippingMethodSpec.php b/spec/Command/Cart/ChooseShippingMethodSpec.php
similarity index 95%
rename from spec/Command/ChooseShippingMethodSpec.php
rename to spec/Command/Cart/ChooseShippingMethodSpec.php
index e3ec6585c..829cffeb0 100644
--- a/spec/Command/ChooseShippingMethodSpec.php
+++ b/spec/Command/Cart/ChooseShippingMethodSpec.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\ShopApiPlugin\Command;
+namespace spec\Sylius\ShopApiPlugin\Command\Cart;
 
 use PhpSpec\ObjectBehavior;
 use TypeError;
diff --git a/spec/Command/CompleteOrderSpec.php b/spec/Command/Cart/CompleteOrderSpec.php
similarity index 96%
rename from spec/Command/CompleteOrderSpec.php
rename to spec/Command/Cart/CompleteOrderSpec.php
index 3ffa0be0f..f1189b005 100644
--- a/spec/Command/CompleteOrderSpec.php
+++ b/spec/Command/Cart/CompleteOrderSpec.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\ShopApiPlugin\Command;
+namespace spec\Sylius\ShopApiPlugin\Command\Cart;
 
 use PhpSpec\ObjectBehavior;
 use TypeError;
diff --git a/spec/Command/DropCartSpec.php b/spec/Command/Cart/DropCartSpec.php
similarity index 91%
rename from spec/Command/DropCartSpec.php
rename to spec/Command/Cart/DropCartSpec.php
index 13961dcce..bb56ad249 100644
--- a/spec/Command/DropCartSpec.php
+++ b/spec/Command/Cart/DropCartSpec.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\ShopApiPlugin\Command;
+namespace spec\Sylius\ShopApiPlugin\Command\Cart;
 
 use PhpSpec\ObjectBehavior;
 use TypeError;
diff --git a/spec/Command/PickupCartSpec.php b/spec/Command/Cart/PickupCartSpec.php
similarity index 94%
rename from spec/Command/PickupCartSpec.php
rename to spec/Command/Cart/PickupCartSpec.php
index 54bee7127..13482bc56 100644
--- a/spec/Command/PickupCartSpec.php
+++ b/spec/Command/Cart/PickupCartSpec.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\ShopApiPlugin\Command;
+namespace spec\Sylius\ShopApiPlugin\Command\Cart;
 
 use PhpSpec\ObjectBehavior;
 use TypeError;
diff --git a/spec/Command/PutOptionBasedConfigurableItemToCartSpec.php b/spec/Command/Cart/PutOptionBasedConfigurableItemToCartSpec.php
similarity index 97%
rename from spec/Command/PutOptionBasedConfigurableItemToCartSpec.php
rename to spec/Command/Cart/PutOptionBasedConfigurableItemToCartSpec.php
index 69bd3c26e..b311e154c 100644
--- a/spec/Command/PutOptionBasedConfigurableItemToCartSpec.php
+++ b/spec/Command/Cart/PutOptionBasedConfigurableItemToCartSpec.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\ShopApiPlugin\Command;
+namespace spec\Sylius\ShopApiPlugin\Command\Cart;
 
 use PhpSpec\ObjectBehavior;
 use TypeError;
diff --git a/spec/Command/PutSimpleItemToCartSpec.php b/spec/Command/Cart/PutSimpleItemToCartSpec.php
similarity index 96%
rename from spec/Command/PutSimpleItemToCartSpec.php
rename to spec/Command/Cart/PutSimpleItemToCartSpec.php
index f1df693c6..e96cc4771 100644
--- a/spec/Command/PutSimpleItemToCartSpec.php
+++ b/spec/Command/Cart/PutSimpleItemToCartSpec.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\ShopApiPlugin\Command;
+namespace spec\Sylius\ShopApiPlugin\Command\Cart;
 
 use PhpSpec\ObjectBehavior;
 use TypeError;
diff --git a/spec/Command/PutVariantBasedConfigurableItemToCartSpec.php b/spec/Command/Cart/PutVariantBasedConfigurableItemToCartSpec.php
similarity index 97%
rename from spec/Command/PutVariantBasedConfigurableItemToCartSpec.php
rename to spec/Command/Cart/PutVariantBasedConfigurableItemToCartSpec.php
index 839ba3b05..c37d63bd7 100644
--- a/spec/Command/PutVariantBasedConfigurableItemToCartSpec.php
+++ b/spec/Command/Cart/PutVariantBasedConfigurableItemToCartSpec.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\ShopApiPlugin\Command;
+namespace spec\Sylius\ShopApiPlugin\Command\Cart;
 
 use PhpSpec\ObjectBehavior;
 use TypeError;
diff --git a/spec/Command/GenerateResetPasswordTokenSpec.php b/spec/Command/Customer/GenerateResetPasswordTokenSpec.php
similarity index 78%
rename from spec/Command/GenerateResetPasswordTokenSpec.php
rename to spec/Command/Customer/GenerateResetPasswordTokenSpec.php
index b8fcab248..c36a704d3 100644
--- a/spec/Command/GenerateResetPasswordTokenSpec.php
+++ b/spec/Command/Customer/GenerateResetPasswordTokenSpec.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\ShopApiPlugin\Command;
+namespace spec\Sylius\ShopApiPlugin\Command\Customer;
 
 use PhpSpec\ObjectBehavior;
-use Sylius\ShopApiPlugin\Command\GenerateResetPasswordToken;
+use Sylius\ShopApiPlugin\Command\Customer\GenerateResetPasswordToken;
 
 final class GenerateResetPasswordTokenSpec extends ObjectBehavior
 {
diff --git a/spec/Command/GenerateVerificationTokenSpec.php b/spec/Command/Customer/GenerateVerificationTokenSpec.php
similarity index 78%
rename from spec/Command/GenerateVerificationTokenSpec.php
rename to spec/Command/Customer/GenerateVerificationTokenSpec.php
index 56086af59..25bf3ef4d 100644
--- a/spec/Command/GenerateVerificationTokenSpec.php
+++ b/spec/Command/Customer/GenerateVerificationTokenSpec.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\ShopApiPlugin\Command;
+namespace spec\Sylius\ShopApiPlugin\Command\Customer;
 
 use PhpSpec\ObjectBehavior;
-use Sylius\ShopApiPlugin\Command\GenerateVerificationToken;
+use Sylius\ShopApiPlugin\Command\Customer\GenerateVerificationToken;
 
 final class GenerateVerificationTokenSpec extends ObjectBehavior
 {
diff --git a/spec/Command/SendResetPasswordTokenSpec.php b/spec/Command/Customer/SendResetPasswordTokenSpec.php
similarity index 82%
rename from spec/Command/SendResetPasswordTokenSpec.php
rename to spec/Command/Customer/SendResetPasswordTokenSpec.php
index 254f0f3cd..7b32f6043 100644
--- a/spec/Command/SendResetPasswordTokenSpec.php
+++ b/spec/Command/Customer/SendResetPasswordTokenSpec.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\ShopApiPlugin\Command;
+namespace spec\Sylius\ShopApiPlugin\Command\Customer;
 
 use PhpSpec\ObjectBehavior;
-use Sylius\ShopApiPlugin\Command\SendResetPasswordToken;
+use Sylius\ShopApiPlugin\Command\Customer\SendResetPasswordToken;
 
 final class SendResetPasswordTokenSpec extends ObjectBehavior
 {
diff --git a/spec/Command/SendVerificationTokenSpec.php b/spec/Command/Customer/SendVerificationTokenSpec.php
similarity index 82%
rename from spec/Command/SendVerificationTokenSpec.php
rename to spec/Command/Customer/SendVerificationTokenSpec.php
index 31132b3d8..2010871dc 100644
--- a/spec/Command/SendVerificationTokenSpec.php
+++ b/spec/Command/Customer/SendVerificationTokenSpec.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\ShopApiPlugin\Command;
+namespace spec\Sylius\ShopApiPlugin\Command\Customer;
 
 use PhpSpec\ObjectBehavior;
-use Sylius\ShopApiPlugin\Command\SendVerificationToken;
+use Sylius\ShopApiPlugin\Command\Customer\SendVerificationToken;
 
 final class SendVerificationTokenSpec extends ObjectBehavior
 {
diff --git a/spec/Command/UpdateCustomerSpec.php b/spec/Command/Customer/UpdateCustomerSpec.php
similarity index 95%
rename from spec/Command/UpdateCustomerSpec.php
rename to spec/Command/Customer/UpdateCustomerSpec.php
index 872934b2d..e22f6bc92 100644
--- a/spec/Command/UpdateCustomerSpec.php
+++ b/spec/Command/Customer/UpdateCustomerSpec.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\ShopApiPlugin\Command;
+namespace spec\Sylius\ShopApiPlugin\Command\Customer;
 
 use PhpSpec\ObjectBehavior;
 
diff --git a/spec/Command/VerifyAccountSpec.php b/spec/Command/Customer/VerifyAccountSpec.php
similarity index 79%
rename from spec/Command/VerifyAccountSpec.php
rename to spec/Command/Customer/VerifyAccountSpec.php
index 06a16dd78..877beea9c 100644
--- a/spec/Command/VerifyAccountSpec.php
+++ b/spec/Command/Customer/VerifyAccountSpec.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\ShopApiPlugin\Command;
+namespace spec\Sylius\ShopApiPlugin\Command\Customer;
 
 use PhpSpec\ObjectBehavior;
-use Sylius\ShopApiPlugin\Command\VerifyAccount;
+use Sylius\ShopApiPlugin\Command\Customer\VerifyAccount;
 
 final class VerifyAccountSpec extends ObjectBehavior
 {
diff --git a/spec/Command/AddProductReviewByCodeSpec.php b/spec/Command/Product/AddProductReviewByCodeSpec.php
similarity index 94%
rename from spec/Command/AddProductReviewByCodeSpec.php
rename to spec/Command/Product/AddProductReviewByCodeSpec.php
index 4d8d64ac9..9b6ffad67 100644
--- a/spec/Command/AddProductReviewByCodeSpec.php
+++ b/spec/Command/Product/AddProductReviewByCodeSpec.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\ShopApiPlugin\Command;
+namespace spec\Sylius\ShopApiPlugin\Command\Product;
 
 use PhpSpec\ObjectBehavior;
 
diff --git a/spec/Command/AddProductReviewBySlugSpec.php b/spec/Command/Product/AddProductReviewBySlugSpec.php
similarity index 94%
rename from spec/Command/AddProductReviewBySlugSpec.php
rename to spec/Command/Product/AddProductReviewBySlugSpec.php
index 7a5977f51..20daed59a 100644
--- a/spec/Command/AddProductReviewBySlugSpec.php
+++ b/spec/Command/Product/AddProductReviewBySlugSpec.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\ShopApiPlugin\Command;
+namespace spec\Sylius\ShopApiPlugin\Command\Product;
 
 use PhpSpec\ObjectBehavior;
 
diff --git a/spec/EventListener/UserRegistrationListenerSpec.php b/spec/EventListener/UserRegistrationListenerSpec.php
index 73e38397b..d4203e62f 100644
--- a/spec/EventListener/UserRegistrationListenerSpec.php
+++ b/spec/EventListener/UserRegistrationListenerSpec.php
@@ -11,8 +11,8 @@
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\GenerateVerificationToken;
-use Sylius\ShopApiPlugin\Command\SendVerificationToken;
+use Sylius\ShopApiPlugin\Command\Customer\GenerateVerificationToken;
+use Sylius\ShopApiPlugin\Command\Customer\SendVerificationToken;
 use Sylius\ShopApiPlugin\Event\CustomerRegistered;
 
 final class UserRegistrationListenerSpec extends ObjectBehavior
diff --git a/spec/Handler/AddressBook/CreateAddressHandlerSpec.php b/spec/Handler/AddressBook/CreateAddressHandlerSpec.php
index 9053c703b..a9aefbcc0 100644
--- a/spec/Handler/AddressBook/CreateAddressHandlerSpec.php
+++ b/spec/Handler/AddressBook/CreateAddressHandlerSpec.php
@@ -11,7 +11,7 @@
 use Sylius\Component\Core\Model\CustomerInterface;
 use Sylius\Component\Resource\Factory\FactoryInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
-use Sylius\ShopApiPlugin\Command\CreateAddress;
+use Sylius\ShopApiPlugin\Command\AddressBook\CreateAddress;
 use Sylius\ShopApiPlugin\Model\Address;
 
 final class CreateAddressHandlerSpec extends ObjectBehavior
diff --git a/spec/Handler/AddressBook/RemoveAddressHandlerSpec.php b/spec/Handler/AddressBook/RemoveAddressHandlerSpec.php
index 83da54d5d..2d438b0e7 100644
--- a/spec/Handler/AddressBook/RemoveAddressHandlerSpec.php
+++ b/spec/Handler/AddressBook/RemoveAddressHandlerSpec.php
@@ -8,7 +8,7 @@
 use Sylius\Component\Core\Model\AddressInterface;
 use Sylius\Component\Core\Repository\AddressRepositoryInterface;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\RemoveAddress;
+use Sylius\ShopApiPlugin\Command\AddressBook\RemoveAddress;
 
 final class RemoveAddressHandlerSpec extends ObjectBehavior
 {
diff --git a/spec/Handler/AddressBook/SetDefaultAddressHandlerSpec.php b/spec/Handler/AddressBook/SetDefaultAddressHandlerSpec.php
index b123ebf46..4062d2295 100644
--- a/spec/Handler/AddressBook/SetDefaultAddressHandlerSpec.php
+++ b/spec/Handler/AddressBook/SetDefaultAddressHandlerSpec.php
@@ -12,7 +12,7 @@
 use Sylius\Component\Core\Repository\AddressRepositoryInterface;
 use Sylius\Component\Core\Repository\CustomerRepositoryInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
-use Sylius\ShopApiPlugin\Command\SetDefaultAddress;
+use Sylius\ShopApiPlugin\Command\AddressBook\SetDefaultAddress;
 
 final class SetDefaultAddressHandlerSpec extends ObjectBehavior
 {
diff --git a/spec/Handler/AddressBook/UpdateAddressBookAddressHandlerSpec.php b/spec/Handler/AddressBook/UpdateAddressBookAddressHandlerSpec.php
index afa6a455e..d332b3afd 100644
--- a/spec/Handler/AddressBook/UpdateAddressBookAddressHandlerSpec.php
+++ b/spec/Handler/AddressBook/UpdateAddressBookAddressHandlerSpec.php
@@ -12,7 +12,7 @@
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\Resource\Factory\FactoryInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
-use Sylius\ShopApiPlugin\Command\UpdateAddress;
+use Sylius\ShopApiPlugin\Command\AddressBook\UpdateAddress;
 use Sylius\ShopApiPlugin\Model\Address;
 
 final class UpdateAddressBookAddressHandlerSpec extends ObjectBehavior
diff --git a/spec/Handler/Cart/AddCouponHandlerSpec.php b/spec/Handler/Cart/AddCouponHandlerSpec.php
index a27c84cc5..69b439235 100644
--- a/spec/Handler/Cart/AddCouponHandlerSpec.php
+++ b/spec/Handler/Cart/AddCouponHandlerSpec.php
@@ -14,7 +14,7 @@
 use Sylius\Component\Promotion\Checker\Eligibility\PromotionCouponEligibilityCheckerInterface;
 use Sylius\Component\Promotion\Checker\Eligibility\PromotionEligibilityCheckerInterface;
 use Sylius\Component\Promotion\Repository\PromotionCouponRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\AddCoupon;
+use Sylius\ShopApiPlugin\Command\Cart\AddCoupon;
 
 final class AddCouponHandlerSpec extends ObjectBehavior
 {
diff --git a/spec/Handler/Cart/AddressOrderHandlerSpec.php b/spec/Handler/Cart/AddressOrderHandlerSpec.php
index 2d75e4be7..2c0d535a1 100644
--- a/spec/Handler/Cart/AddressOrderHandlerSpec.php
+++ b/spec/Handler/Cart/AddressOrderHandlerSpec.php
@@ -12,7 +12,7 @@
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\OrderCheckoutTransitions;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\AddressOrder as AddressShipmentCommand;
+use Sylius\ShopApiPlugin\Command\Cart\AddressOrder as AddressShipmentCommand;
 use Sylius\ShopApiPlugin\Model\Address;
 
 final class AddressOrderHandlerSpec extends ObjectBehavior
diff --git a/spec/Handler/Cart/ChangeItemQuantityHandlerSpec.php b/spec/Handler/Cart/ChangeItemQuantityHandlerSpec.php
index d833e5fba..0983b94f2 100644
--- a/spec/Handler/Cart/ChangeItemQuantityHandlerSpec.php
+++ b/spec/Handler/Cart/ChangeItemQuantityHandlerSpec.php
@@ -11,7 +11,7 @@
 use Sylius\Component\Order\Modifier\OrderItemQuantityModifierInterface;
 use Sylius\Component\Order\Processor\OrderProcessorInterface;
 use Sylius\Component\Order\Repository\OrderItemRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\ChangeItemQuantity;
+use Sylius\ShopApiPlugin\Command\Cart\ChangeItemQuantity;
 
 final class ChangeItemQuantityHandlerSpec extends ObjectBehavior
 {
diff --git a/spec/Handler/Cart/ChoosePaymentMethodHandlerSpec.php b/spec/Handler/Cart/ChoosePaymentMethodHandlerSpec.php
index 36fbc80fa..a33ba4f4d 100644
--- a/spec/Handler/Cart/ChoosePaymentMethodHandlerSpec.php
+++ b/spec/Handler/Cart/ChoosePaymentMethodHandlerSpec.php
@@ -15,7 +15,7 @@
 use Sylius\Component\Core\OrderCheckoutTransitions;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
 use Sylius\Component\Core\Repository\PaymentMethodRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\ChoosePaymentMethod;
+use Sylius\ShopApiPlugin\Command\Cart\ChoosePaymentMethod;
 
 final class ChoosePaymentMethodHandlerSpec extends ObjectBehavior
 {
diff --git a/spec/Handler/Cart/ChooseShippingMethodHandlerSpec.php b/spec/Handler/Cart/ChooseShippingMethodHandlerSpec.php
index db1c2741a..1c3c0f04d 100644
--- a/spec/Handler/Cart/ChooseShippingMethodHandlerSpec.php
+++ b/spec/Handler/Cart/ChooseShippingMethodHandlerSpec.php
@@ -16,7 +16,7 @@
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
 use Sylius\Component\Core\Repository\ShippingMethodRepositoryInterface;
 use Sylius\Component\Shipping\Checker\ShippingMethodEligibilityCheckerInterface;
-use Sylius\ShopApiPlugin\Command\ChooseShippingMethod;
+use Sylius\ShopApiPlugin\Command\Cart\ChooseShippingMethod;
 
 final class ChooseShippingMethodHandlerSpec extends ObjectBehavior
 {
diff --git a/spec/Handler/Cart/CompleteOrderHandlerSpec.php b/spec/Handler/Cart/CompleteOrderHandlerSpec.php
index 4347f0d3e..c7ebc46cf 100644
--- a/spec/Handler/Cart/CompleteOrderHandlerSpec.php
+++ b/spec/Handler/Cart/CompleteOrderHandlerSpec.php
@@ -11,7 +11,7 @@
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\OrderCheckoutTransitions;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\CompleteOrder;
+use Sylius\ShopApiPlugin\Command\Cart\CompleteOrder;
 use Sylius\ShopApiPlugin\Provider\CustomerProviderInterface;
 
 final class CompleteOrderHandlerSpec extends ObjectBehavior
diff --git a/spec/Handler/Cart/DropCartHandlerSpec.php b/spec/Handler/Cart/DropCartHandlerSpec.php
index 4a8c3ce4b..da1089863 100644
--- a/spec/Handler/Cart/DropCartHandlerSpec.php
+++ b/spec/Handler/Cart/DropCartHandlerSpec.php
@@ -7,7 +7,7 @@
 use PhpSpec\ObjectBehavior;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\DropCart;
+use Sylius\ShopApiPlugin\Command\Cart\DropCart;
 
 final class DropCartHandlerSpec extends ObjectBehavior
 {
diff --git a/spec/Handler/Cart/PickupCartHandlerSpec.php b/spec/Handler/Cart/PickupCartHandlerSpec.php
index 9976ce131..e20cb2c5a 100644
--- a/spec/Handler/Cart/PickupCartHandlerSpec.php
+++ b/spec/Handler/Cart/PickupCartHandlerSpec.php
@@ -12,7 +12,7 @@
 use Sylius\Component\Currency\Model\CurrencyInterface;
 use Sylius\Component\Locale\Model\LocaleInterface;
 use Sylius\Component\Resource\Factory\FactoryInterface;
-use Sylius\ShopApiPlugin\Command\PickupCart;
+use Sylius\ShopApiPlugin\Command\Cart\PickupCart;
 use Sylius\ShopApiPlugin\Handler\Cart\PickupCartHandler;
 
 final class PickupCartHandlerSpec extends ObjectBehavior
diff --git a/spec/Handler/Cart/PutOptionBasedConfigurableItemToCartHandlerSpec.php b/spec/Handler/Cart/PutOptionBasedConfigurableItemToCartHandlerSpec.php
index 39c94be93..23daa700b 100644
--- a/spec/Handler/Cart/PutOptionBasedConfigurableItemToCartHandlerSpec.php
+++ b/spec/Handler/Cart/PutOptionBasedConfigurableItemToCartHandlerSpec.php
@@ -13,7 +13,7 @@
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
 use Sylius\Component\Core\Repository\ProductRepositoryInterface;
 use Sylius\Component\Product\Model\ProductOptionValueInterface;
-use Sylius\ShopApiPlugin\Command\PutOptionBasedConfigurableItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutOptionBasedConfigurableItemToCart;
 use Sylius\ShopApiPlugin\Modifier\OrderModifierInterface;
 
 final class PutOptionBasedConfigurableItemToCartHandlerSpec extends ObjectBehavior
diff --git a/spec/Handler/Cart/PutSimpleItemToCartHandlerSpec.php b/spec/Handler/Cart/PutSimpleItemToCartHandlerSpec.php
index 01da5c455..0fca4807e 100644
--- a/spec/Handler/Cart/PutSimpleItemToCartHandlerSpec.php
+++ b/spec/Handler/Cart/PutSimpleItemToCartHandlerSpec.php
@@ -11,7 +11,7 @@
 use Sylius\Component\Core\Model\ProductVariantInterface;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
 use Sylius\Component\Core\Repository\ProductRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\PutSimpleItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutSimpleItemToCart;
 use Sylius\ShopApiPlugin\Modifier\OrderModifierInterface;
 
 final class PutSimpleItemToCartHandlerSpec extends ObjectBehavior
diff --git a/spec/Handler/Cart/PutVariantBasedConfigurableItemToCartHandlerSpec.php b/spec/Handler/Cart/PutVariantBasedConfigurableItemToCartHandlerSpec.php
index d92b35b4a..cb33b58f9 100644
--- a/spec/Handler/Cart/PutVariantBasedConfigurableItemToCartHandlerSpec.php
+++ b/spec/Handler/Cart/PutVariantBasedConfigurableItemToCartHandlerSpec.php
@@ -9,7 +9,7 @@
 use Sylius\Component\Core\Model\ProductVariantInterface;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
 use Sylius\Component\Core\Repository\ProductVariantRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\PutVariantBasedConfigurableItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutVariantBasedConfigurableItemToCart;
 use Sylius\ShopApiPlugin\Modifier\OrderModifierInterface;
 
 final class PutVariantBasedConfigurableItemToCartHandlerSpec extends ObjectBehavior
diff --git a/spec/Handler/Customer/GenerateResetPasswordTokenHandlerSpec.php b/spec/Handler/Customer/GenerateResetPasswordTokenHandlerSpec.php
index d685a9004..ef4419197 100644
--- a/spec/Handler/Customer/GenerateResetPasswordTokenHandlerSpec.php
+++ b/spec/Handler/Customer/GenerateResetPasswordTokenHandlerSpec.php
@@ -9,7 +9,7 @@
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
 use Sylius\Component\User\Security\Generator\GeneratorInterface;
-use Sylius\ShopApiPlugin\Command\GenerateResetPasswordToken;
+use Sylius\ShopApiPlugin\Command\Customer\GenerateResetPasswordToken;
 use Sylius\ShopApiPlugin\Handler\Customer\GenerateResetPasswordTokenHandler;
 
 final class GenerateResetPasswordTokenHandlerSpec extends ObjectBehavior
diff --git a/spec/Handler/Customer/GenerateVerificationTokenHandlerSpec.php b/spec/Handler/Customer/GenerateVerificationTokenHandlerSpec.php
index c75f20523..81f5aa7df 100644
--- a/spec/Handler/Customer/GenerateVerificationTokenHandlerSpec.php
+++ b/spec/Handler/Customer/GenerateVerificationTokenHandlerSpec.php
@@ -8,7 +8,7 @@
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
 use Sylius\Component\User\Security\Generator\GeneratorInterface;
-use Sylius\ShopApiPlugin\Command\GenerateVerificationToken;
+use Sylius\ShopApiPlugin\Command\Customer\GenerateVerificationToken;
 use Sylius\ShopApiPlugin\Handler\Customer\GenerateVerificationTokenHandler;
 
 final class GenerateVerificationTokenHandlerSpec extends ObjectBehavior
diff --git a/spec/Handler/Customer/SendResetPasswordTokenHandlerSpec.php b/spec/Handler/Customer/SendResetPasswordTokenHandlerSpec.php
index 53d6fa8d2..e1cc82052 100644
--- a/spec/Handler/Customer/SendResetPasswordTokenHandlerSpec.php
+++ b/spec/Handler/Customer/SendResetPasswordTokenHandlerSpec.php
@@ -8,7 +8,7 @@
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\Mailer\Sender\SenderInterface;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\SendResetPasswordToken;
+use Sylius\ShopApiPlugin\Command\Customer\SendResetPasswordToken;
 use Sylius\ShopApiPlugin\Handler\Customer\SendResetPasswordTokenHandler;
 use Sylius\ShopApiPlugin\Mailer\Emails;
 
diff --git a/spec/Handler/Customer/SendVerificationTokenHandlerSpec.php b/spec/Handler/Customer/SendVerificationTokenHandlerSpec.php
index 23395c5a0..b93c15777 100644
--- a/spec/Handler/Customer/SendVerificationTokenHandlerSpec.php
+++ b/spec/Handler/Customer/SendVerificationTokenHandlerSpec.php
@@ -8,7 +8,7 @@
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\Mailer\Sender\SenderInterface;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\SendVerificationToken;
+use Sylius\ShopApiPlugin\Command\Customer\SendVerificationToken;
 use Sylius\ShopApiPlugin\Handler\Customer\SendVerificationTokenHandler;
 use Sylius\ShopApiPlugin\Mailer\Emails;
 
diff --git a/spec/Handler/Customer/UpdateCustomerHandlerSpec.php b/spec/Handler/Customer/UpdateCustomerHandlerSpec.php
index 2ed4edb48..1661aed08 100644
--- a/spec/Handler/Customer/UpdateCustomerHandlerSpec.php
+++ b/spec/Handler/Customer/UpdateCustomerHandlerSpec.php
@@ -7,7 +7,7 @@
 use PhpSpec\ObjectBehavior;
 use Sylius\Component\Core\Model\CustomerInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
-use Sylius\ShopApiPlugin\Command\UpdateCustomer;
+use Sylius\ShopApiPlugin\Command\Customer\UpdateCustomer;
 
 final class UpdateCustomerHandlerSpec extends ObjectBehavior
 {
diff --git a/spec/Handler/Customer/VerifyAccountHandlerSpec.php b/spec/Handler/Customer/VerifyAccountHandlerSpec.php
index f7181bc28..33c3ae8f9 100644
--- a/spec/Handler/Customer/VerifyAccountHandlerSpec.php
+++ b/spec/Handler/Customer/VerifyAccountHandlerSpec.php
@@ -8,7 +8,7 @@
 use Prophecy\Argument;
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\VerifyAccount;
+use Sylius\ShopApiPlugin\Command\Customer\VerifyAccount;
 use Sylius\ShopApiPlugin\Handler\Customer\VerifyAccountHandler;
 
 final class VerifyAccountHandlerSpec extends ObjectBehavior
diff --git a/spec/Handler/Product/AddProductReviewByCodeHandlerSpec.php b/spec/Handler/Product/AddProductReviewByCodeHandlerSpec.php
index 1c624bc1a..fdbae1d60 100644
--- a/spec/Handler/Product/AddProductReviewByCodeHandlerSpec.php
+++ b/spec/Handler/Product/AddProductReviewByCodeHandlerSpec.php
@@ -13,7 +13,7 @@
 use Sylius\Component\Core\Repository\ProductReviewRepositoryInterface;
 use Sylius\Component\Review\Factory\ReviewFactoryInterface;
 use Sylius\Component\Review\Model\ReviewInterface;
-use Sylius\ShopApiPlugin\Command\AddProductReviewByCode;
+use Sylius\ShopApiPlugin\Command\Product\AddProductReviewByCode;
 use Sylius\ShopApiPlugin\Handler\Product\AddProductReviewByCodeHandler;
 use Sylius\ShopApiPlugin\Provider\ProductReviewerProviderInterface;
 
diff --git a/spec/Handler/Product/AddProductReviewBySlugHandlerSpec.php b/spec/Handler/Product/AddProductReviewBySlugHandlerSpec.php
index 6a82de3c0..1bddb408a 100644
--- a/spec/Handler/Product/AddProductReviewBySlugHandlerSpec.php
+++ b/spec/Handler/Product/AddProductReviewBySlugHandlerSpec.php
@@ -14,7 +14,7 @@
 use Sylius\Component\Locale\Model\LocaleInterface;
 use Sylius\Component\Review\Factory\ReviewFactoryInterface;
 use Sylius\Component\Review\Model\ReviewInterface;
-use Sylius\ShopApiPlugin\Command\AddProductReviewBySlug;
+use Sylius\ShopApiPlugin\Command\Product\AddProductReviewBySlug;
 use Sylius\ShopApiPlugin\Handler\Product\AddProductReviewBySlugHandler;
 use Sylius\ShopApiPlugin\Provider\ProductReviewerProviderInterface;
 
diff --git a/spec/Normalizer/RequestCartTokenNormalizerSpec.php b/spec/Normalizer/RequestCartTokenNormalizerSpec.php
index d53125dff..02b735b31 100644
--- a/spec/Normalizer/RequestCartTokenNormalizerSpec.php
+++ b/spec/Normalizer/RequestCartTokenNormalizerSpec.php
@@ -7,7 +7,7 @@
 use League\Tactician\CommandBus;
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
-use Sylius\ShopApiPlugin\Command\PickupCart;
+use Sylius\ShopApiPlugin\Command\Cart\PickupCart;
 use Sylius\ShopApiPlugin\Normalizer\RequestCartTokenNormalizerInterface;
 use Sylius\ShopApiPlugin\Request\PickupCartRequest;
 use Symfony\Component\HttpFoundation\ParameterBag;
diff --git a/src/Command/CreateAddress.php b/src/Command/AddressBook/CreateAddress.php
similarity index 90%
rename from src/Command/CreateAddress.php
rename to src/Command/AddressBook/CreateAddress.php
index ca4c99a09..ad3f6006e 100644
--- a/src/Command/CreateAddress.php
+++ b/src/Command/AddressBook/CreateAddress.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\AddressBook;
 
 use Sylius\ShopApiPlugin\Model\Address;
 
diff --git a/src/Command/RemoveAddress.php b/src/Command/AddressBook/RemoveAddress.php
similarity index 89%
rename from src/Command/RemoveAddress.php
rename to src/Command/AddressBook/RemoveAddress.php
index 993d32554..efacaf8f8 100644
--- a/src/Command/RemoveAddress.php
+++ b/src/Command/AddressBook/RemoveAddress.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\AddressBook;
 
 class RemoveAddress
 {
diff --git a/src/Command/SetDefaultAddress.php b/src/Command/AddressBook/SetDefaultAddress.php
similarity index 89%
rename from src/Command/SetDefaultAddress.php
rename to src/Command/AddressBook/SetDefaultAddress.php
index 646e814e6..2e56ddcf4 100644
--- a/src/Command/SetDefaultAddress.php
+++ b/src/Command/AddressBook/SetDefaultAddress.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\AddressBook;
 
 class SetDefaultAddress
 {
diff --git a/src/Command/UpdateAddress.php b/src/Command/AddressBook/UpdateAddress.php
similarity index 96%
rename from src/Command/UpdateAddress.php
rename to src/Command/AddressBook/UpdateAddress.php
index e6692f316..45d6b8327 100644
--- a/src/Command/UpdateAddress.php
+++ b/src/Command/AddressBook/UpdateAddress.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\AddressBook;
 
 use Sylius\ShopApiPlugin\Model\Address;
 
diff --git a/src/Command/AddCoupon.php b/src/Command/Cart/AddCoupon.php
similarity index 91%
rename from src/Command/AddCoupon.php
rename to src/Command/Cart/AddCoupon.php
index d55ae920f..e0396c991 100644
--- a/src/Command/AddCoupon.php
+++ b/src/Command/Cart/AddCoupon.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\Cart;
 
 class AddCoupon
 {
diff --git a/src/Command/AddressOrder.php b/src/Command/Cart/AddressOrder.php
similarity index 94%
rename from src/Command/AddressOrder.php
rename to src/Command/Cart/AddressOrder.php
index 05155b31d..f4885289c 100644
--- a/src/Command/AddressOrder.php
+++ b/src/Command/Cart/AddressOrder.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\Cart;
 
 use Sylius\ShopApiPlugin\Model\Address;
 
diff --git a/src/Command/ChangeItemQuantity.php b/src/Command/Cart/ChangeItemQuantity.php
similarity index 94%
rename from src/Command/ChangeItemQuantity.php
rename to src/Command/Cart/ChangeItemQuantity.php
index a958752fd..ba3dccc0f 100644
--- a/src/Command/ChangeItemQuantity.php
+++ b/src/Command/Cart/ChangeItemQuantity.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\Cart;
 
 use Webmozart\Assert\Assert;
 
diff --git a/src/Command/ChoosePaymentMethod.php b/src/Command/Cart/ChoosePaymentMethod.php
similarity index 94%
rename from src/Command/ChoosePaymentMethod.php
rename to src/Command/Cart/ChoosePaymentMethod.php
index b28d2b6e9..1a0da1ebf 100644
--- a/src/Command/ChoosePaymentMethod.php
+++ b/src/Command/Cart/ChoosePaymentMethod.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\Cart;
 
 class ChoosePaymentMethod
 {
diff --git a/src/Command/ChooseShippingMethod.php b/src/Command/Cart/ChooseShippingMethod.php
similarity index 94%
rename from src/Command/ChooseShippingMethod.php
rename to src/Command/Cart/ChooseShippingMethod.php
index 332f9cb51..e4a056a81 100644
--- a/src/Command/ChooseShippingMethod.php
+++ b/src/Command/Cart/ChooseShippingMethod.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\Cart;
 
 class ChooseShippingMethod
 {
diff --git a/src/Command/CompleteOrder.php b/src/Command/Cart/CompleteOrder.php
similarity index 93%
rename from src/Command/CompleteOrder.php
rename to src/Command/Cart/CompleteOrder.php
index 38da21ba6..62edb615c 100644
--- a/src/Command/CompleteOrder.php
+++ b/src/Command/Cart/CompleteOrder.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\Cart;
 
 class CompleteOrder
 {
diff --git a/src/Command/DropCart.php b/src/Command/Cart/DropCart.php
similarity index 86%
rename from src/Command/DropCart.php
rename to src/Command/Cart/DropCart.php
index 3fb6a574b..106e54c2f 100644
--- a/src/Command/DropCart.php
+++ b/src/Command/Cart/DropCart.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\Cart;
 
 class DropCart
 {
diff --git a/src/Command/PickupCart.php b/src/Command/Cart/PickupCart.php
similarity index 91%
rename from src/Command/PickupCart.php
rename to src/Command/Cart/PickupCart.php
index d1f4de3f9..8f7467379 100644
--- a/src/Command/PickupCart.php
+++ b/src/Command/Cart/PickupCart.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\Cart;
 
 class PickupCart
 {
diff --git a/src/Command/PutOptionBasedConfigurableItemToCart.php b/src/Command/Cart/PutOptionBasedConfigurableItemToCart.php
similarity index 95%
rename from src/Command/PutOptionBasedConfigurableItemToCart.php
rename to src/Command/Cart/PutOptionBasedConfigurableItemToCart.php
index 7cf3fb24f..c897ba2cb 100644
--- a/src/Command/PutOptionBasedConfigurableItemToCart.php
+++ b/src/Command/Cart/PutOptionBasedConfigurableItemToCart.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\Cart;
 
 use Webmozart\Assert\Assert;
 
diff --git a/src/Command/PutSimpleItemToCart.php b/src/Command/Cart/PutSimpleItemToCart.php
similarity index 94%
rename from src/Command/PutSimpleItemToCart.php
rename to src/Command/Cart/PutSimpleItemToCart.php
index 1459f14c0..271567e1e 100644
--- a/src/Command/PutSimpleItemToCart.php
+++ b/src/Command/Cart/PutSimpleItemToCart.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\Cart;
 
 use Webmozart\Assert\Assert;
 
diff --git a/src/Command/PutVariantBasedConfigurableItemToCart.php b/src/Command/Cart/PutVariantBasedConfigurableItemToCart.php
similarity index 95%
rename from src/Command/PutVariantBasedConfigurableItemToCart.php
rename to src/Command/Cart/PutVariantBasedConfigurableItemToCart.php
index 0670af1b3..605d9e3a1 100644
--- a/src/Command/PutVariantBasedConfigurableItemToCart.php
+++ b/src/Command/Cart/PutVariantBasedConfigurableItemToCart.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\Cart;
 
 use Webmozart\Assert\Assert;
 
diff --git a/src/Command/RemoveCoupon.php b/src/Command/Cart/RemoveCoupon.php
similarity index 86%
rename from src/Command/RemoveCoupon.php
rename to src/Command/Cart/RemoveCoupon.php
index 2e3e711d2..9a476766c 100644
--- a/src/Command/RemoveCoupon.php
+++ b/src/Command/Cart/RemoveCoupon.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\Cart;
 
 class RemoveCoupon
 {
diff --git a/src/Command/RemoveItemFromCart.php b/src/Command/Cart/RemoveItemFromCart.php
similarity index 91%
rename from src/Command/RemoveItemFromCart.php
rename to src/Command/Cart/RemoveItemFromCart.php
index 9aff104a0..2367ae53c 100644
--- a/src/Command/RemoveItemFromCart.php
+++ b/src/Command/Cart/RemoveItemFromCart.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\Cart;
 
 class RemoveItemFromCart
 {
diff --git a/src/Command/GenerateResetPasswordToken.php b/src/Command/Customer/GenerateResetPasswordToken.php
similarity index 85%
rename from src/Command/GenerateResetPasswordToken.php
rename to src/Command/Customer/GenerateResetPasswordToken.php
index 898d95d82..c1a6f33cc 100644
--- a/src/Command/GenerateResetPasswordToken.php
+++ b/src/Command/Customer/GenerateResetPasswordToken.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\Customer;
 
 class GenerateResetPasswordToken
 {
diff --git a/src/Command/GenerateVerificationToken.php b/src/Command/Customer/GenerateVerificationToken.php
similarity index 85%
rename from src/Command/GenerateVerificationToken.php
rename to src/Command/Customer/GenerateVerificationToken.php
index 534eb1fea..f3378df9f 100644
--- a/src/Command/GenerateVerificationToken.php
+++ b/src/Command/Customer/GenerateVerificationToken.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\Customer;
 
 class GenerateVerificationToken
 {
diff --git a/src/Command/RegisterCustomer.php b/src/Command/Customer/RegisterCustomer.php
similarity index 95%
rename from src/Command/RegisterCustomer.php
rename to src/Command/Customer/RegisterCustomer.php
index d9f297f31..07e44f777 100644
--- a/src/Command/RegisterCustomer.php
+++ b/src/Command/Customer/RegisterCustomer.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\Customer;
 
 class RegisterCustomer
 {
diff --git a/src/Command/SendResetPasswordToken.php b/src/Command/Customer/SendResetPasswordToken.php
similarity index 90%
rename from src/Command/SendResetPasswordToken.php
rename to src/Command/Customer/SendResetPasswordToken.php
index 7975bae92..19e647cb7 100644
--- a/src/Command/SendResetPasswordToken.php
+++ b/src/Command/Customer/SendResetPasswordToken.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\Customer;
 
 class SendResetPasswordToken
 {
diff --git a/src/Command/SendVerificationToken.php b/src/Command/Customer/SendVerificationToken.php
similarity index 90%
rename from src/Command/SendVerificationToken.php
rename to src/Command/Customer/SendVerificationToken.php
index a3209352f..b6e10ce37 100644
--- a/src/Command/SendVerificationToken.php
+++ b/src/Command/Customer/SendVerificationToken.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\Customer;
 
 class SendVerificationToken
 {
diff --git a/src/Command/UpdateCustomer.php b/src/Command/Customer/UpdateCustomer.php
similarity index 96%
rename from src/Command/UpdateCustomer.php
rename to src/Command/Customer/UpdateCustomer.php
index 16e94ca51..302f3bb1c 100644
--- a/src/Command/UpdateCustomer.php
+++ b/src/Command/Customer/UpdateCustomer.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\Customer;
 
 class UpdateCustomer
 {
diff --git a/src/Command/VerifyAccount.php b/src/Command/Customer/VerifyAccount.php
similarity index 84%
rename from src/Command/VerifyAccount.php
rename to src/Command/Customer/VerifyAccount.php
index 5cfbc2e3b..43c80b674 100644
--- a/src/Command/VerifyAccount.php
+++ b/src/Command/Customer/VerifyAccount.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\Customer;
 
 class VerifyAccount
 {
diff --git a/src/Command/AddProductReviewByCode.php b/src/Command/Product/AddProductReviewByCode.php
similarity index 96%
rename from src/Command/AddProductReviewByCode.php
rename to src/Command/Product/AddProductReviewByCode.php
index 5dc981e6e..ce679ee30 100644
--- a/src/Command/AddProductReviewByCode.php
+++ b/src/Command/Product/AddProductReviewByCode.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\Product;
 
 class AddProductReviewByCode
 {
diff --git a/src/Command/AddProductReviewBySlug.php b/src/Command/Product/AddProductReviewBySlug.php
similarity index 96%
rename from src/Command/AddProductReviewBySlug.php
rename to src/Command/Product/AddProductReviewBySlug.php
index b6a0c3118..eb624f8db 100644
--- a/src/Command/AddProductReviewBySlug.php
+++ b/src/Command/Product/AddProductReviewBySlug.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Sylius\ShopApiPlugin\Command;
+namespace Sylius\ShopApiPlugin\Command\Product;
 
 class AddProductReviewBySlug
 {
diff --git a/src/Controller/AddressBook/CreateAddressAction.php b/src/Controller/AddressBook/CreateAddressAction.php
index 54776159a..bab4a89c4 100644
--- a/src/Controller/AddressBook/CreateAddressAction.php
+++ b/src/Controller/AddressBook/CreateAddressAction.php
@@ -10,7 +10,7 @@
 use Sylius\Component\Core\Model\Customer;
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\Core\Repository\AddressRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\CreateAddress;
+use Sylius\ShopApiPlugin\Command\AddressBook\CreateAddress;
 use Sylius\ShopApiPlugin\Factory\AddressBook\AddressBookViewFactoryInterface;
 use Sylius\ShopApiPlugin\Factory\ValidationErrorViewFactoryInterface;
 use Sylius\ShopApiPlugin\Model\Address;
diff --git a/src/Controller/AddressBook/UpdateAddressAction.php b/src/Controller/AddressBook/UpdateAddressAction.php
index 0ef3e2ed1..e7f1e83cf 100644
--- a/src/Controller/AddressBook/UpdateAddressAction.php
+++ b/src/Controller/AddressBook/UpdateAddressAction.php
@@ -10,7 +10,7 @@
 use Sylius\Component\Core\Model\AddressInterface;
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\Core\Repository\AddressRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\UpdateAddress;
+use Sylius\ShopApiPlugin\Command\AddressBook\UpdateAddress;
 use Sylius\ShopApiPlugin\Factory\AddressBook\AddressBookViewFactoryInterface;
 use Sylius\ShopApiPlugin\Factory\ValidationErrorViewFactoryInterface;
 use Sylius\ShopApiPlugin\Model\Address;
diff --git a/src/Controller/Checkout/AddressAction.php b/src/Controller/Checkout/AddressAction.php
index 5f80238bc..a9b5823e0 100644
--- a/src/Controller/Checkout/AddressAction.php
+++ b/src/Controller/Checkout/AddressAction.php
@@ -7,7 +7,7 @@
 use FOS\RestBundle\View\View;
 use FOS\RestBundle\View\ViewHandlerInterface;
 use League\Tactician\CommandBus;
-use Sylius\ShopApiPlugin\Command\AddressOrder;
+use Sylius\ShopApiPlugin\Command\Cart\AddressOrder;
 use Sylius\ShopApiPlugin\Model\Address;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/src/Controller/Checkout/ChoosePaymentMethodAction.php b/src/Controller/Checkout/ChoosePaymentMethodAction.php
index 427a18cc0..0d325557f 100644
--- a/src/Controller/Checkout/ChoosePaymentMethodAction.php
+++ b/src/Controller/Checkout/ChoosePaymentMethodAction.php
@@ -7,7 +7,7 @@
 use FOS\RestBundle\View\View;
 use FOS\RestBundle\View\ViewHandlerInterface;
 use League\Tactician\CommandBus;
-use Sylius\ShopApiPlugin\Command\ChoosePaymentMethod;
+use Sylius\ShopApiPlugin\Command\Cart\ChoosePaymentMethod;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
diff --git a/src/Controller/Checkout/ChooseShippingMethodAction.php b/src/Controller/Checkout/ChooseShippingMethodAction.php
index d569b7e9f..97b5468e0 100644
--- a/src/Controller/Checkout/ChooseShippingMethodAction.php
+++ b/src/Controller/Checkout/ChooseShippingMethodAction.php
@@ -7,7 +7,7 @@
 use FOS\RestBundle\View\View;
 use FOS\RestBundle\View\ViewHandlerInterface;
 use League\Tactician\CommandBus;
-use Sylius\ShopApiPlugin\Command\ChooseShippingMethod;
+use Sylius\ShopApiPlugin\Command\Cart\ChooseShippingMethod;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
diff --git a/src/Controller/Checkout/CompleteOrderAction.php b/src/Controller/Checkout/CompleteOrderAction.php
index 9a96899da..cb6820737 100644
--- a/src/Controller/Checkout/CompleteOrderAction.php
+++ b/src/Controller/Checkout/CompleteOrderAction.php
@@ -7,7 +7,7 @@
 use FOS\RestBundle\View\View;
 use FOS\RestBundle\View\ViewHandlerInterface;
 use League\Tactician\CommandBus;
-use Sylius\ShopApiPlugin\Command\CompleteOrder;
+use Sylius\ShopApiPlugin\Command\Cart\CompleteOrder;
 use Sylius\ShopApiPlugin\Exception\WrongUserException;
 use Sylius\ShopApiPlugin\Provider\LoggedInShopUserProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/src/Controller/Customer/RequestPasswordResettingAction.php b/src/Controller/Customer/RequestPasswordResettingAction.php
index fa3821137..45fa4f0a8 100644
--- a/src/Controller/Customer/RequestPasswordResettingAction.php
+++ b/src/Controller/Customer/RequestPasswordResettingAction.php
@@ -7,8 +7,8 @@
 use FOS\RestBundle\View\View;
 use FOS\RestBundle\View\ViewHandlerInterface;
 use League\Tactician\CommandBus;
-use Sylius\ShopApiPlugin\Command\GenerateResetPasswordToken;
-use Sylius\ShopApiPlugin\Command\SendResetPasswordToken;
+use Sylius\ShopApiPlugin\Command\Customer\GenerateResetPasswordToken;
+use Sylius\ShopApiPlugin\Command\Customer\SendResetPasswordToken;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
diff --git a/src/EventListener/UserRegistrationListener.php b/src/EventListener/UserRegistrationListener.php
index f0f02cecc..004efeaa5 100644
--- a/src/EventListener/UserRegistrationListener.php
+++ b/src/EventListener/UserRegistrationListener.php
@@ -9,8 +9,8 @@
 use Sylius\Component\Channel\Repository\ChannelRepositoryInterface;
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\GenerateVerificationToken;
-use Sylius\ShopApiPlugin\Command\SendVerificationToken;
+use Sylius\ShopApiPlugin\Command\Customer\GenerateVerificationToken;
+use Sylius\ShopApiPlugin\Command\Customer\SendVerificationToken;
 use Sylius\ShopApiPlugin\Event\CustomerRegistered;
 use Webmozart\Assert\Assert;
 
diff --git a/src/Handler/AddressBook/CreateAddressHandler.php b/src/Handler/AddressBook/CreateAddressHandler.php
index 35d5b6244..e3a238beb 100644
--- a/src/Handler/AddressBook/CreateAddressHandler.php
+++ b/src/Handler/AddressBook/CreateAddressHandler.php
@@ -9,7 +9,7 @@
 use Sylius\Component\Core\Model\CustomerInterface;
 use Sylius\Component\Resource\Factory\FactoryInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
-use Sylius\ShopApiPlugin\Command\CreateAddress;
+use Sylius\ShopApiPlugin\Command\AddressBook\CreateAddress;
 use Webmozart\Assert\Assert;
 
 final class CreateAddressHandler
diff --git a/src/Handler/AddressBook/RemoveAddressHandler.php b/src/Handler/AddressBook/RemoveAddressHandler.php
index aea49ddbd..6e4b39833 100644
--- a/src/Handler/AddressBook/RemoveAddressHandler.php
+++ b/src/Handler/AddressBook/RemoveAddressHandler.php
@@ -7,7 +7,7 @@
 use Sylius\Component\Core\Model\AddressInterface;
 use Sylius\Component\Core\Repository\AddressRepositoryInterface;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\RemoveAddress;
+use Sylius\ShopApiPlugin\Command\AddressBook\RemoveAddress;
 
 final class RemoveAddressHandler
 {
diff --git a/src/Handler/AddressBook/SetDefaultAddressHandler.php b/src/Handler/AddressBook/SetDefaultAddressHandler.php
index 16024d284..654e8c538 100644
--- a/src/Handler/AddressBook/SetDefaultAddressHandler.php
+++ b/src/Handler/AddressBook/SetDefaultAddressHandler.php
@@ -10,7 +10,7 @@
 use Sylius\Component\Core\Repository\AddressRepositoryInterface;
 use Sylius\Component\Core\Repository\CustomerRepositoryInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
-use Sylius\ShopApiPlugin\Command\SetDefaultAddress;
+use Sylius\ShopApiPlugin\Command\AddressBook\SetDefaultAddress;
 use Webmozart\Assert\Assert;
 
 final class SetDefaultAddressHandler
diff --git a/src/Handler/AddressBook/UpdateAddressBookAddressHandler.php b/src/Handler/AddressBook/UpdateAddressBookAddressHandler.php
index 13f86afbb..1c4396d0c 100644
--- a/src/Handler/AddressBook/UpdateAddressBookAddressHandler.php
+++ b/src/Handler/AddressBook/UpdateAddressBookAddressHandler.php
@@ -9,7 +9,7 @@
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\Resource\Factory\FactoryInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
-use Sylius\ShopApiPlugin\Command\UpdateAddress;
+use Sylius\ShopApiPlugin\Command\AddressBook\UpdateAddress;
 use Webmozart\Assert\Assert;
 
 final class UpdateAddressBookAddressHandler
diff --git a/src/Handler/Cart/AddCouponHandler.php b/src/Handler/Cart/AddCouponHandler.php
index ee5a86172..a7dc77497 100644
--- a/src/Handler/Cart/AddCouponHandler.php
+++ b/src/Handler/Cart/AddCouponHandler.php
@@ -10,7 +10,7 @@
 use Sylius\Component\Order\Processor\OrderProcessorInterface;
 use Sylius\Component\Promotion\Checker\Eligibility\PromotionCouponEligibilityCheckerInterface;
 use Sylius\Component\Promotion\Repository\PromotionCouponRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\AddCoupon;
+use Sylius\ShopApiPlugin\Command\Cart\AddCoupon;
 use Webmozart\Assert\Assert;
 
 final class AddCouponHandler
diff --git a/src/Handler/Cart/AddressOrderHandler.php b/src/Handler/Cart/AddressOrderHandler.php
index 30c99c263..3b612ad0a 100644
--- a/src/Handler/Cart/AddressOrderHandler.php
+++ b/src/Handler/Cart/AddressOrderHandler.php
@@ -10,7 +10,7 @@
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\OrderCheckoutTransitions;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\AddressOrder;
+use Sylius\ShopApiPlugin\Command\Cart\AddressOrder;
 use Webmozart\Assert\Assert;
 
 final class AddressOrderHandler
diff --git a/src/Handler/Cart/ChangeItemQuantityHandler.php b/src/Handler/Cart/ChangeItemQuantityHandler.php
index 9123e30e0..bc06641b2 100644
--- a/src/Handler/Cart/ChangeItemQuantityHandler.php
+++ b/src/Handler/Cart/ChangeItemQuantityHandler.php
@@ -10,7 +10,7 @@
 use Sylius\Component\Order\Modifier\OrderItemQuantityModifierInterface;
 use Sylius\Component\Order\Processor\OrderProcessorInterface;
 use Sylius\Component\Order\Repository\OrderItemRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\ChangeItemQuantity;
+use Sylius\ShopApiPlugin\Command\Cart\ChangeItemQuantity;
 use Webmozart\Assert\Assert;
 
 final class ChangeItemQuantityHandler
diff --git a/src/Handler/Cart/ChoosePaymentMethodHandler.php b/src/Handler/Cart/ChoosePaymentMethodHandler.php
index ed65f8283..0c84fc18f 100644
--- a/src/Handler/Cart/ChoosePaymentMethodHandler.php
+++ b/src/Handler/Cart/ChoosePaymentMethodHandler.php
@@ -10,7 +10,7 @@
 use Sylius\Component\Core\OrderCheckoutTransitions;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
 use Sylius\Component\Core\Repository\PaymentMethodRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\ChoosePaymentMethod;
+use Sylius\ShopApiPlugin\Command\Cart\ChoosePaymentMethod;
 use Webmozart\Assert\Assert;
 
 final class ChoosePaymentMethodHandler
diff --git a/src/Handler/Cart/ChooseShippingMethodHandler.php b/src/Handler/Cart/ChooseShippingMethodHandler.php
index 734b0f0b8..876fcd673 100644
--- a/src/Handler/Cart/ChooseShippingMethodHandler.php
+++ b/src/Handler/Cart/ChooseShippingMethodHandler.php
@@ -11,7 +11,7 @@
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
 use Sylius\Component\Core\Repository\ShippingMethodRepositoryInterface;
 use Sylius\Component\Shipping\Checker\ShippingMethodEligibilityCheckerInterface;
-use Sylius\ShopApiPlugin\Command\ChooseShippingMethod;
+use Sylius\ShopApiPlugin\Command\Cart\ChooseShippingMethod;
 use Webmozart\Assert\Assert;
 
 final class ChooseShippingMethodHandler
diff --git a/src/Handler/Cart/CompleteOrderHandler.php b/src/Handler/Cart/CompleteOrderHandler.php
index 8f7389dfb..4238f9e6f 100644
--- a/src/Handler/Cart/CompleteOrderHandler.php
+++ b/src/Handler/Cart/CompleteOrderHandler.php
@@ -8,7 +8,7 @@
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\OrderCheckoutTransitions;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\CompleteOrder;
+use Sylius\ShopApiPlugin\Command\Cart\CompleteOrder;
 use Sylius\ShopApiPlugin\Provider\CustomerProviderInterface;
 use Webmozart\Assert\Assert;
 
diff --git a/src/Handler/Cart/DropCartHandler.php b/src/Handler/Cart/DropCartHandler.php
index d3ecf0105..13d1ba0a8 100644
--- a/src/Handler/Cart/DropCartHandler.php
+++ b/src/Handler/Cart/DropCartHandler.php
@@ -6,7 +6,7 @@
 
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\DropCart;
+use Sylius\ShopApiPlugin\Command\Cart\DropCart;
 use Webmozart\Assert\Assert;
 
 final class DropCartHandler
diff --git a/src/Handler/Cart/PickupCartHandler.php b/src/Handler/Cart/PickupCartHandler.php
index 00f5c41a7..da1988686 100644
--- a/src/Handler/Cart/PickupCartHandler.php
+++ b/src/Handler/Cart/PickupCartHandler.php
@@ -9,7 +9,7 @@
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
 use Sylius\Component\Resource\Factory\FactoryInterface;
-use Sylius\ShopApiPlugin\Command\PickupCart;
+use Sylius\ShopApiPlugin\Command\Cart\PickupCart;
 use Webmozart\Assert\Assert;
 
 final class PickupCartHandler
diff --git a/src/Handler/Cart/PutOptionBasedConfigurableItemToCartHandler.php b/src/Handler/Cart/PutOptionBasedConfigurableItemToCartHandler.php
index 095420731..1ca678afa 100644
--- a/src/Handler/Cart/PutOptionBasedConfigurableItemToCartHandler.php
+++ b/src/Handler/Cart/PutOptionBasedConfigurableItemToCartHandler.php
@@ -9,7 +9,7 @@
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
 use Sylius\Component\Core\Repository\ProductRepositoryInterface;
 use Sylius\Component\Product\Model\ProductInterface;
-use Sylius\ShopApiPlugin\Command\PutOptionBasedConfigurableItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutOptionBasedConfigurableItemToCart;
 use Sylius\ShopApiPlugin\Modifier\OrderModifierInterface;
 use Webmozart\Assert\Assert;
 
diff --git a/src/Handler/Cart/PutSimpleItemToCartHandler.php b/src/Handler/Cart/PutSimpleItemToCartHandler.php
index 05ffec4f7..b53a6dd0c 100644
--- a/src/Handler/Cart/PutSimpleItemToCartHandler.php
+++ b/src/Handler/Cart/PutSimpleItemToCartHandler.php
@@ -8,7 +8,7 @@
 use Sylius\Component\Core\Model\ProductInterface;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
 use Sylius\Component\Core\Repository\ProductRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\PutSimpleItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutSimpleItemToCart;
 use Sylius\ShopApiPlugin\Modifier\OrderModifierInterface;
 use Webmozart\Assert\Assert;
 
diff --git a/src/Handler/Cart/PutVariantBasedConfigurableItemToCartHandler.php b/src/Handler/Cart/PutVariantBasedConfigurableItemToCartHandler.php
index eb032bd85..9dd7e0a70 100644
--- a/src/Handler/Cart/PutVariantBasedConfigurableItemToCartHandler.php
+++ b/src/Handler/Cart/PutVariantBasedConfigurableItemToCartHandler.php
@@ -8,7 +8,7 @@
 use Sylius\Component\Core\Model\ProductVariantInterface;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
 use Sylius\Component\Core\Repository\ProductVariantRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\PutVariantBasedConfigurableItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutVariantBasedConfigurableItemToCart;
 use Sylius\ShopApiPlugin\Modifier\OrderModifierInterface;
 use Webmozart\Assert\Assert;
 
diff --git a/src/Handler/Cart/RemoveCouponHandler.php b/src/Handler/Cart/RemoveCouponHandler.php
index dcafcd594..fc7d267e1 100644
--- a/src/Handler/Cart/RemoveCouponHandler.php
+++ b/src/Handler/Cart/RemoveCouponHandler.php
@@ -7,7 +7,7 @@
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
 use Sylius\Component\Order\Processor\OrderProcessorInterface;
-use Sylius\ShopApiPlugin\Command\RemoveCoupon;
+use Sylius\ShopApiPlugin\Command\Cart\RemoveCoupon;
 use Webmozart\Assert\Assert;
 
 final class RemoveCouponHandler
diff --git a/src/Handler/Cart/RemoveItemFromCartHandler.php b/src/Handler/Cart/RemoveItemFromCartHandler.php
index 2bbdb9a76..cba959516 100644
--- a/src/Handler/Cart/RemoveItemFromCartHandler.php
+++ b/src/Handler/Cart/RemoveItemFromCartHandler.php
@@ -9,7 +9,7 @@
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
 use Sylius\Component\Order\Processor\OrderProcessorInterface;
 use Sylius\Component\Order\Repository\OrderItemRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\RemoveItemFromCart;
+use Sylius\ShopApiPlugin\Command\Cart\RemoveItemFromCart;
 use Webmozart\Assert\Assert;
 
 final class RemoveItemFromCartHandler
diff --git a/src/Handler/Customer/GenerateResetPasswordTokenHandler.php b/src/Handler/Customer/GenerateResetPasswordTokenHandler.php
index bd5ebb86e..2fa973985 100644
--- a/src/Handler/Customer/GenerateResetPasswordTokenHandler.php
+++ b/src/Handler/Customer/GenerateResetPasswordTokenHandler.php
@@ -7,7 +7,7 @@
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
 use Sylius\Component\User\Security\Generator\GeneratorInterface;
-use Sylius\ShopApiPlugin\Command\GenerateResetPasswordToken;
+use Sylius\ShopApiPlugin\Command\Customer\GenerateResetPasswordToken;
 use Webmozart\Assert\Assert;
 
 final class GenerateResetPasswordTokenHandler
diff --git a/src/Handler/Customer/GenerateVerificationTokenHandler.php b/src/Handler/Customer/GenerateVerificationTokenHandler.php
index 703014029..75cc01dfc 100644
--- a/src/Handler/Customer/GenerateVerificationTokenHandler.php
+++ b/src/Handler/Customer/GenerateVerificationTokenHandler.php
@@ -7,7 +7,7 @@
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
 use Sylius\Component\User\Security\Generator\GeneratorInterface;
-use Sylius\ShopApiPlugin\Command\GenerateVerificationToken;
+use Sylius\ShopApiPlugin\Command\Customer\GenerateVerificationToken;
 use Webmozart\Assert\Assert;
 
 final class GenerateVerificationTokenHandler
diff --git a/src/Handler/Customer/RegisterCustomerHandler.php b/src/Handler/Customer/RegisterCustomerHandler.php
index 0370be874..6386324b5 100644
--- a/src/Handler/Customer/RegisterCustomerHandler.php
+++ b/src/Handler/Customer/RegisterCustomerHandler.php
@@ -9,7 +9,7 @@
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\Resource\Factory\FactoryInterface;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\RegisterCustomer;
+use Sylius\ShopApiPlugin\Command\Customer\RegisterCustomer;
 use Sylius\ShopApiPlugin\Event\CustomerRegistered;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Webmozart\Assert\Assert;
diff --git a/src/Handler/Customer/SendResetPasswordTokenHandler.php b/src/Handler/Customer/SendResetPasswordTokenHandler.php
index 171070207..fed9d6c53 100644
--- a/src/Handler/Customer/SendResetPasswordTokenHandler.php
+++ b/src/Handler/Customer/SendResetPasswordTokenHandler.php
@@ -7,7 +7,7 @@
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\Mailer\Sender\SenderInterface;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\SendResetPasswordToken;
+use Sylius\ShopApiPlugin\Command\Customer\SendResetPasswordToken;
 use Sylius\ShopApiPlugin\Mailer\Emails;
 use Webmozart\Assert\Assert;
 
diff --git a/src/Handler/Customer/SendVerificationTokenHandler.php b/src/Handler/Customer/SendVerificationTokenHandler.php
index 1c19dd3ae..a1efa0854 100644
--- a/src/Handler/Customer/SendVerificationTokenHandler.php
+++ b/src/Handler/Customer/SendVerificationTokenHandler.php
@@ -7,7 +7,7 @@
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\Mailer\Sender\SenderInterface;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\SendVerificationToken;
+use Sylius\ShopApiPlugin\Command\Customer\SendVerificationToken;
 use Sylius\ShopApiPlugin\Mailer\Emails;
 use Webmozart\Assert\Assert;
 
diff --git a/src/Handler/Customer/UpdateCustomerHandler.php b/src/Handler/Customer/UpdateCustomerHandler.php
index c155eff8c..7927d931a 100644
--- a/src/Handler/Customer/UpdateCustomerHandler.php
+++ b/src/Handler/Customer/UpdateCustomerHandler.php
@@ -6,7 +6,7 @@
 
 use Sylius\Component\Core\Model\CustomerInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;
-use Sylius\ShopApiPlugin\Command\UpdateCustomer;
+use Sylius\ShopApiPlugin\Command\Customer\UpdateCustomer;
 
 final class UpdateCustomerHandler
 {
diff --git a/src/Handler/Customer/VerifyAccountHandler.php b/src/Handler/Customer/VerifyAccountHandler.php
index c8c4af431..cce34557b 100644
--- a/src/Handler/Customer/VerifyAccountHandler.php
+++ b/src/Handler/Customer/VerifyAccountHandler.php
@@ -6,7 +6,7 @@
 
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\VerifyAccount;
+use Sylius\ShopApiPlugin\Command\Customer\VerifyAccount;
 use Webmozart\Assert\Assert;
 
 final class VerifyAccountHandler
diff --git a/src/Handler/Product/AddProductReviewByCodeHandler.php b/src/Handler/Product/AddProductReviewByCodeHandler.php
index ea3cef039..a785cbe2f 100644
--- a/src/Handler/Product/AddProductReviewByCodeHandler.php
+++ b/src/Handler/Product/AddProductReviewByCodeHandler.php
@@ -9,7 +9,7 @@
 use Sylius\Component\Core\Repository\ProductRepositoryInterface;
 use Sylius\Component\Core\Repository\ProductReviewRepositoryInterface;
 use Sylius\Component\Review\Factory\ReviewFactoryInterface;
-use Sylius\ShopApiPlugin\Command\AddProductReviewByCode;
+use Sylius\ShopApiPlugin\Command\Product\AddProductReviewByCode;
 use Sylius\ShopApiPlugin\Provider\ProductReviewerProviderInterface;
 use Webmozart\Assert\Assert;
 
diff --git a/src/Handler/Product/AddProductReviewBySlugHandler.php b/src/Handler/Product/AddProductReviewBySlugHandler.php
index c16a69c29..38054c89f 100644
--- a/src/Handler/Product/AddProductReviewBySlugHandler.php
+++ b/src/Handler/Product/AddProductReviewBySlugHandler.php
@@ -9,7 +9,7 @@
 use Sylius\Component\Core\Repository\ProductRepositoryInterface;
 use Sylius\Component\Core\Repository\ProductReviewRepositoryInterface;
 use Sylius\Component\Review\Factory\ReviewFactoryInterface;
-use Sylius\ShopApiPlugin\Command\AddProductReviewBySlug;
+use Sylius\ShopApiPlugin\Command\Product\AddProductReviewBySlug;
 use Sylius\ShopApiPlugin\Provider\ProductReviewerProviderInterface;
 use Webmozart\Assert\Assert;
 
diff --git a/src/Request/AddCouponRequest.php b/src/Request/AddCouponRequest.php
index 262228294..b9ce49146 100644
--- a/src/Request/AddCouponRequest.php
+++ b/src/Request/AddCouponRequest.php
@@ -4,7 +4,7 @@
 
 namespace Sylius\ShopApiPlugin\Request;
 
-use Sylius\ShopApiPlugin\Command\AddCoupon;
+use Sylius\ShopApiPlugin\Command\Cart\AddCoupon;
 use Symfony\Component\HttpFoundation\Request;
 
 class AddCouponRequest
diff --git a/src/Request/AddProductReviewByCodeRequest.php b/src/Request/AddProductReviewByCodeRequest.php
index c035372ae..ca14701fa 100644
--- a/src/Request/AddProductReviewByCodeRequest.php
+++ b/src/Request/AddProductReviewByCodeRequest.php
@@ -4,7 +4,7 @@
 
 namespace Sylius\ShopApiPlugin\Request;
 
-use Sylius\ShopApiPlugin\Command\AddProductReviewByCode;
+use Sylius\ShopApiPlugin\Command\Product\AddProductReviewByCode;
 use Symfony\Component\HttpFoundation\Request;
 
 class AddProductReviewByCodeRequest
diff --git a/src/Request/AddProductReviewBySlugRequest.php b/src/Request/AddProductReviewBySlugRequest.php
index b6aa7cc3b..064c2bad0 100644
--- a/src/Request/AddProductReviewBySlugRequest.php
+++ b/src/Request/AddProductReviewBySlugRequest.php
@@ -4,7 +4,7 @@
 
 namespace Sylius\ShopApiPlugin\Request;
 
-use Sylius\ShopApiPlugin\Command\AddProductReviewBySlug;
+use Sylius\ShopApiPlugin\Command\Product\AddProductReviewBySlug;
 use Symfony\Component\HttpFoundation\Request;
 
 class AddProductReviewBySlugRequest
diff --git a/src/Request/ChangeItemQuantityRequest.php b/src/Request/ChangeItemQuantityRequest.php
index 58ba0abca..ae3672224 100644
--- a/src/Request/ChangeItemQuantityRequest.php
+++ b/src/Request/ChangeItemQuantityRequest.php
@@ -4,7 +4,7 @@
 
 namespace Sylius\ShopApiPlugin\Request;
 
-use Sylius\ShopApiPlugin\Command\ChangeItemQuantity;
+use Sylius\ShopApiPlugin\Command\Cart\ChangeItemQuantity;
 use Symfony\Component\HttpFoundation\Request;
 
 class ChangeItemQuantityRequest
diff --git a/src/Request/DropCartRequest.php b/src/Request/DropCartRequest.php
index 198b40dee..aee814ba5 100644
--- a/src/Request/DropCartRequest.php
+++ b/src/Request/DropCartRequest.php
@@ -4,7 +4,7 @@
 
 namespace Sylius\ShopApiPlugin\Request;
 
-use Sylius\ShopApiPlugin\Command\DropCart;
+use Sylius\ShopApiPlugin\Command\Cart\DropCart;
 use Symfony\Component\HttpFoundation\Request;
 
 class DropCartRequest
diff --git a/src/Request/PickupCartRequest.php b/src/Request/PickupCartRequest.php
index b917ad4c5..9bc229963 100644
--- a/src/Request/PickupCartRequest.php
+++ b/src/Request/PickupCartRequest.php
@@ -5,7 +5,7 @@
 namespace Sylius\ShopApiPlugin\Request;
 
 use Ramsey\Uuid\Uuid;
-use Sylius\ShopApiPlugin\Command\PickupCart;
+use Sylius\ShopApiPlugin\Command\Cart\PickupCart;
 use Symfony\Component\HttpFoundation\Request;
 
 class PickupCartRequest
diff --git a/src/Request/PutOptionBasedConfigurableItemToCartRequest.php b/src/Request/PutOptionBasedConfigurableItemToCartRequest.php
index 6c4c40523..bdcbbada5 100644
--- a/src/Request/PutOptionBasedConfigurableItemToCartRequest.php
+++ b/src/Request/PutOptionBasedConfigurableItemToCartRequest.php
@@ -4,7 +4,7 @@
 
 namespace Sylius\ShopApiPlugin\Request;
 
-use Sylius\ShopApiPlugin\Command\PutOptionBasedConfigurableItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutOptionBasedConfigurableItemToCart;
 use Symfony\Component\HttpFoundation\Request;
 
 class PutOptionBasedConfigurableItemToCartRequest
diff --git a/src/Request/PutSimpleItemToCartRequest.php b/src/Request/PutSimpleItemToCartRequest.php
index f4558ed3d..7f7e2f673 100644
--- a/src/Request/PutSimpleItemToCartRequest.php
+++ b/src/Request/PutSimpleItemToCartRequest.php
@@ -4,7 +4,7 @@
 
 namespace Sylius\ShopApiPlugin\Request;
 
-use Sylius\ShopApiPlugin\Command\PutSimpleItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutSimpleItemToCart;
 use Symfony\Component\HttpFoundation\Request;
 
 class PutSimpleItemToCartRequest
diff --git a/src/Request/PutVariantBasedConfigurableItemToCartRequest.php b/src/Request/PutVariantBasedConfigurableItemToCartRequest.php
index 697fcff39..735881200 100644
--- a/src/Request/PutVariantBasedConfigurableItemToCartRequest.php
+++ b/src/Request/PutVariantBasedConfigurableItemToCartRequest.php
@@ -4,7 +4,7 @@
 
 namespace Sylius\ShopApiPlugin\Request;
 
-use Sylius\ShopApiPlugin\Command\PutVariantBasedConfigurableItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutVariantBasedConfigurableItemToCart;
 use Symfony\Component\HttpFoundation\Request;
 
 class PutVariantBasedConfigurableItemToCartRequest
diff --git a/src/Request/RegisterCustomerRequest.php b/src/Request/RegisterCustomerRequest.php
index 1223a0a1b..c34c5f13b 100644
--- a/src/Request/RegisterCustomerRequest.php
+++ b/src/Request/RegisterCustomerRequest.php
@@ -4,7 +4,7 @@
 
 namespace Sylius\ShopApiPlugin\Request;
 
-use Sylius\ShopApiPlugin\Command\RegisterCustomer;
+use Sylius\ShopApiPlugin\Command\Customer\RegisterCustomer;
 use Symfony\Component\HttpFoundation\Request;
 
 class RegisterCustomerRequest
diff --git a/src/Request/RemoveAddressRequest.php b/src/Request/RemoveAddressRequest.php
index 51ed87e52..f7f65ae84 100644
--- a/src/Request/RemoveAddressRequest.php
+++ b/src/Request/RemoveAddressRequest.php
@@ -4,7 +4,7 @@
 
 namespace Sylius\ShopApiPlugin\Request;
 
-use Sylius\ShopApiPlugin\Command\RemoveAddress;
+use Sylius\ShopApiPlugin\Command\AddressBook\RemoveAddress;
 use Symfony\Component\HttpFoundation\Request;
 
 class RemoveAddressRequest
diff --git a/src/Request/RemoveCouponRequest.php b/src/Request/RemoveCouponRequest.php
index e49395ddc..59cb5533a 100644
--- a/src/Request/RemoveCouponRequest.php
+++ b/src/Request/RemoveCouponRequest.php
@@ -4,7 +4,7 @@
 
 namespace Sylius\ShopApiPlugin\Request;
 
-use Sylius\ShopApiPlugin\Command\RemoveCoupon;
+use Sylius\ShopApiPlugin\Command\Cart\RemoveCoupon;
 use Symfony\Component\HttpFoundation\Request;
 
 class RemoveCouponRequest
diff --git a/src/Request/RemoveItemFromCartRequest.php b/src/Request/RemoveItemFromCartRequest.php
index 108910f97..8a9e2a00d 100644
--- a/src/Request/RemoveItemFromCartRequest.php
+++ b/src/Request/RemoveItemFromCartRequest.php
@@ -4,7 +4,7 @@
 
 namespace Sylius\ShopApiPlugin\Request;
 
-use Sylius\ShopApiPlugin\Command\RemoveItemFromCart;
+use Sylius\ShopApiPlugin\Command\Cart\RemoveItemFromCart;
 use Symfony\Component\HttpFoundation\Request;
 
 class RemoveItemFromCartRequest
diff --git a/src/Request/ResendVerificationTokenRequest.php b/src/Request/ResendVerificationTokenRequest.php
index b1bb3d3e4..4120c7dd1 100644
--- a/src/Request/ResendVerificationTokenRequest.php
+++ b/src/Request/ResendVerificationTokenRequest.php
@@ -4,7 +4,7 @@
 
 namespace Sylius\ShopApiPlugin\Request;
 
-use Sylius\ShopApiPlugin\Command\SendVerificationToken;
+use Sylius\ShopApiPlugin\Command\Customer\SendVerificationToken;
 use Symfony\Component\HttpFoundation\Request;
 
 class ResendVerificationTokenRequest
diff --git a/src/Request/SetDefaultAddressRequest.php b/src/Request/SetDefaultAddressRequest.php
index 09a3d5a88..bd926a37c 100644
--- a/src/Request/SetDefaultAddressRequest.php
+++ b/src/Request/SetDefaultAddressRequest.php
@@ -4,7 +4,7 @@
 
 namespace Sylius\ShopApiPlugin\Request;
 
-use Sylius\ShopApiPlugin\Command\SetDefaultAddress;
+use Sylius\ShopApiPlugin\Command\AddressBook\SetDefaultAddress;
 use Symfony\Component\HttpFoundation\Request;
 
 class SetDefaultAddressRequest
diff --git a/src/Request/UpdateCustomerRequest.php b/src/Request/UpdateCustomerRequest.php
index b2571fac8..5b854a681 100644
--- a/src/Request/UpdateCustomerRequest.php
+++ b/src/Request/UpdateCustomerRequest.php
@@ -5,7 +5,7 @@
 namespace Sylius\ShopApiPlugin\Request;
 
 use DateTimeInterface;
-use Sylius\ShopApiPlugin\Command\UpdateCustomer;
+use Sylius\ShopApiPlugin\Command\Customer\UpdateCustomer;
 use Symfony\Component\HttpFoundation\Request;
 
 class UpdateCustomerRequest
diff --git a/src/Request/VerifyAccountRequest.php b/src/Request/VerifyAccountRequest.php
index 45321f1b7..6435298d8 100644
--- a/src/Request/VerifyAccountRequest.php
+++ b/src/Request/VerifyAccountRequest.php
@@ -4,7 +4,7 @@
 
 namespace Sylius\ShopApiPlugin\Request;
 
-use Sylius\ShopApiPlugin\Command\VerifyAccount;
+use Sylius\ShopApiPlugin\Command\Customer\VerifyAccount;
 use Symfony\Component\HttpFoundation\Request;
 
 class VerifyAccountRequest
diff --git a/src/Resources/config/services/handler/address_book.xml b/src/Resources/config/services/handler/address_book.xml
index 86f3d4acc..0a2aae76e 100644
--- a/src/Resources/config/services/handler/address_book.xml
+++ b/src/Resources/config/services/handler/address_book.xml
@@ -9,14 +9,14 @@
             <argument type="service" id="sylius.repository.province" />
             <argument type="service" id="sylius.repository.customer" />
             <argument type="service" id="sylius.factory.address" />
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\CreateAddress" />
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\AddressBook\CreateAddress" />
         </service>
 
         <service id="sylius.shop_api_plugin.handler.remove_address_handler"
                  class="Sylius\ShopApiPlugin\Handler\AddressBook\RemoveAddressHandler">
             <argument type="service" id="sylius.repository.address" />
             <argument type="service" id="sylius.repository.order" />
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\RemoveAddress" />
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\AddressBook\RemoveAddress" />
         </service>
 
         <service id="sylius.shop_api_plugin.handler.set_default_address_handler"
@@ -24,7 +24,7 @@
             <argument type="service" id="sylius.repository.customer" />
             <argument type="service" id="sylius.repository.address" />
             <argument type="service" id="sylius.repository.shop_user" />
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\SetDefaultAddress" />
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\AddressBook\SetDefaultAddress" />
         </service>
 
         <service id="sylius.shop_api_plugin.handler.update_address_book_address"
@@ -34,7 +34,7 @@
             <argument type="service" id="sylius.repository.province" />
             <argument type="service" id="sylius.repository.shop_user" />
             <argument type="service" id="sylius.factory.address" />
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\UpdateAddress" />
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\AddressBook\UpdateAddress" />
         </service>
     </services>
 </container>
diff --git a/src/Resources/config/services/handler/cart.xml b/src/Resources/config/services/handler/cart.xml
index abe5c1697..24ef90cdc 100644
--- a/src/Resources/config/services/handler/cart.xml
+++ b/src/Resources/config/services/handler/cart.xml
@@ -7,7 +7,7 @@
             <argument type="service" id="sylius.repository.order"/>
             <argument type="service" id="sylius.factory.address"/>
             <argument type="service" id="sm.factory"/>
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\AddressOrder"/>
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\Cart\AddressOrder"/>
         </service>
 
         <service id="sylius.shop_api_plugin.handler.pickup_cart_handler"
@@ -15,13 +15,13 @@
             <argument type="service" id="sylius.factory.order"/>
             <argument type="service" id="sylius.repository.order"/>
             <argument type="service" id="sylius.repository.channel"/>
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\PickupCart"/>
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\Cart\PickupCart"/>
         </service>
 
         <service id="sylius.shop_api_plugin.handler.drop_cart_handler"
                  class="Sylius\ShopApiPlugin\Handler\Cart\DropCartHandler">
             <argument type="service" id="sylius.repository.order"/>
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\DropCart"/>
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\Cart\DropCart"/>
         </service>
 
         <service id="sylius.shop_api_plugin.handler.put_simple_item_to_cart_handler"
@@ -29,7 +29,7 @@
             <argument type="service" id="sylius.repository.order"/>
             <argument type="service" id="sylius.repository.product"/>
             <argument type="service" id="sylius.shop_api_plugin.modifier.order_modifier"/>
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\PutSimpleItemToCart"/>
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\Cart\PutSimpleItemToCart"/>
         </service>
 
         <service id="sylius.shop_api_plugin.handler.put_variant_based_configurable_item_to_cart_handler"
@@ -37,7 +37,7 @@
             <argument type="service" id="sylius.repository.order"/>
             <argument type="service" id="sylius.repository.product_variant"/>
             <argument type="service" id="sylius.shop_api_plugin.modifier.order_modifier"/>
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\PutVariantBasedConfigurableItemToCart"/>
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\Cart\PutVariantBasedConfigurableItemToCart"/>
         </service>
 
         <service id="sylius.shop_api_plugin.handler.put_option_based_configurable_item_to_cart_handler"
@@ -45,7 +45,7 @@
             <argument type="service" id="sylius.repository.order"/>
             <argument type="service" id="sylius.repository.product"/>
             <argument type="service" id="sylius.shop_api_plugin.modifier.order_modifier"/>
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\PutOptionBasedConfigurableItemToCart"/>
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\Cart\PutOptionBasedConfigurableItemToCart"/>
         </service>
 
         <service id="sylius.shop_api_plugin.handler.change_item_quantity_handler"
@@ -54,7 +54,7 @@
             <argument type="service" id="sylius.repository.order"/>
             <argument type="service" id="sylius.order_item_quantity_modifier"/>
             <argument type="service" id="sylius.order_processing.order_processor"/>
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\ChangeItemQuantity"/>
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\Cart\ChangeItemQuantity"/>
         </service>
 
         <service id="sylius.shop_api_plugin.handler.remove_item_from_cart_handler"
@@ -62,7 +62,7 @@
             <argument type="service" id="sylius.repository.order_item"/>
             <argument type="service" id="sylius.repository.order"/>
             <argument type="service" id="sylius.order_processing.order_processor"/>
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\RemoveItemFromCart"/>
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\Cart\RemoveItemFromCart"/>
         </service>
 
         <service id="sylius.shop_api_plugin.handler.choose_shipping_method_handler"
@@ -71,7 +71,7 @@
             <argument type="service" id="sylius.repository.shipping_method"/>
             <argument type="service" id="sylius.shipping_eligibility_checker"/>
             <argument type="service" id="sm.factory"/>
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\ChooseShippingMethod"/>
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\Cart\ChooseShippingMethod"/>
         </service>
 
         <service id="sylius.shop_api_plugin.handler.choose_payment_method_handler"
@@ -79,7 +79,7 @@
             <argument type="service" id="sylius.repository.order"/>
             <argument type="service" id="sylius.repository.payment_method"/>
             <argument type="service" id="sm.factory"/>
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\ChoosePaymentMethod"/>
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\Cart\ChoosePaymentMethod"/>
         </service>
 
         <service id="sylius.shop_api_plugin.handler.add_coupon_handler"
@@ -88,14 +88,14 @@
             <argument type="service" id="sylius.repository.promotion_coupon"/>
             <argument type="service" id="sylius.order_processing.order_processor"/>
             <argument type="service" id="sylius.shop_api_plugin.checker.promotion_coupon_eligibility_checker"/>
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\AddCoupon"/>
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\Cart\AddCoupon"/>
         </service>
 
         <service id="sylius.shop_api_plugin.handler.remove_coupon_handler"
                  class="Sylius\ShopApiPlugin\Handler\Cart\RemoveCouponHandler">
             <argument type="service" id="sylius.repository.order"/>
             <argument type="service" id="sylius.order_processing.order_processor"/>
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\RemoveCoupon"/>
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\Cart\RemoveCoupon"/>
         </service>
 
         <service id="sylius.shop_api_plugin.handler.complete_order_handler"
@@ -103,7 +103,7 @@
             <argument type="service" id="sylius.repository.order"/>
             <argument type="service" id="sylius.shop_api_plugin.provider.customer_provider" />
             <argument type="service" id="sm.factory"/>
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\CompleteOrder"/>
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\Cart\CompleteOrder"/>
         </service>
     </services>
 </container>
diff --git a/src/Resources/config/services/handler/customer.xml b/src/Resources/config/services/handler/customer.xml
index 2febc06bb..550b31a1a 100644
--- a/src/Resources/config/services/handler/customer.xml
+++ b/src/Resources/config/services/handler/customer.xml
@@ -9,47 +9,47 @@
             <argument type="service" id="sylius.factory.shop_user"/>
             <argument type="service" id="sylius.factory.customer"/>
             <argument type="service" id="event_dispatcher"/>
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\RegisterCustomer"/>
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\Customer\RegisterCustomer"/>
         </service>
 
         <service id="sylius.shop_api_plugin.handler.update_customer"
                      class="Sylius\ShopApiPlugin\Handler\Customer\UpdateCustomerHandler">
             <argument type="service" id="sylius.repository.customer"/>
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\UpdateCustomer"/>
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\Customer\UpdateCustomer"/>
         </service>
 
         <service id="sylius.shop_api_plugin.handler.send_verification_token_handler"
                  class="Sylius\ShopApiPlugin\Handler\Customer\SendVerificationTokenHandler">
             <argument type="service" id="sylius.repository.shop_user"/>
             <argument type="service" id="sylius.email_sender"/>
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\SendVerificationToken"/>
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\Customer\SendVerificationToken"/>
         </service>
 
         <service id="sylius.shop_api_plugin.handler.verify_account_handler"
                  class="Sylius\ShopApiPlugin\Handler\Customer\VerifyAccountHandler">
             <argument type="service" id="sylius.repository.shop_user"/>
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\VerifyAccount"/>
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\Customer\VerifyAccount"/>
         </service>
 
         <service id="sylius.shop_api_plugin.handler.generate_verification_token_handler"
                  class="Sylius\ShopApiPlugin\Handler\Customer\GenerateVerificationTokenHandler">
             <argument type="service" id="sylius.repository.shop_user"/>
             <argument type="service" id="sylius.shop_user.token_generator.email_verification"/>
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\GenerateVerificationToken"/>
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\Customer\GenerateVerificationToken"/>
         </service>
 
         <service id="sylius.shop_api_plugin.handler.send_reset_password_token_handler"
                  class="Sylius\ShopApiPlugin\Handler\Customer\SendResetPasswordTokenHandler">
             <argument type="service" id="sylius.repository.shop_user"/>
             <argument type="service" id="sylius.email_sender"/>
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\SendResetPasswordToken"/>
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\Customer\SendResetPasswordToken"/>
         </service>
 
         <service id="sylius.shop_api_plugin.handler.generate_reset_password_token_handler"
                  class="Sylius\ShopApiPlugin\Handler\Customer\GenerateResetPasswordTokenHandler">
             <argument type="service" id="sylius.repository.shop_user"/>
             <argument type="service" id="sylius.shop_user.token_generator.email_verification"/>
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\GenerateResetPasswordToken"/>
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\Customer\GenerateResetPasswordToken"/>
         </service>
 
     </services>
diff --git a/src/Resources/config/services/handler/product.xml b/src/Resources/config/services/handler/product.xml
index eb0662d06..4120ecab3 100644
--- a/src/Resources/config/services/handler/product.xml
+++ b/src/Resources/config/services/handler/product.xml
@@ -9,7 +9,7 @@
             <argument type="service" id="sylius.repository.product"/>
             <argument type="service" id="sylius.shop_api_plugin.provider.product_reviewer_provider"/>
             <argument type="service" id="sylius.factory.product_review"/>
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\AddProductReviewBySlug"/>
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\Product\AddProductReviewBySlug"/>
         </service>
 
         <service id="sylius.shop_api_plugin.handler.add_product_review_by_code_handler"
@@ -19,7 +19,7 @@
             <argument type="service" id="sylius.repository.product"/>
             <argument type="service" id="sylius.shop_api_plugin.provider.product_reviewer_provider"/>
             <argument type="service" id="sylius.factory.product_review"/>
-            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\AddProductReviewByCode"/>
+            <tag name="tactician.handler" command="Sylius\ShopApiPlugin\Command\Product\AddProductReviewByCode"/>
         </service>
 
     </services>
diff --git a/tests/Controller/Cart/CartAddCouponShopApiTest.php b/tests/Controller/Cart/CartAddCouponShopApiTest.php
index 2dd48fc1a..9d53adba9 100644
--- a/tests/Controller/Cart/CartAddCouponShopApiTest.php
+++ b/tests/Controller/Cart/CartAddCouponShopApiTest.php
@@ -5,8 +5,8 @@
 namespace Tests\Sylius\ShopApiPlugin\Controller\Cart;
 
 use League\Tactician\CommandBus;
-use Sylius\ShopApiPlugin\Command\PickupCart;
-use Sylius\ShopApiPlugin\Command\PutSimpleItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\PickupCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutSimpleItemToCart;
 use Symfony\Component\HttpFoundation\Response;
 use Tests\Sylius\ShopApiPlugin\Controller\JsonApiTestCase;
 
diff --git a/tests/Controller/Cart/CartChangeItemQuantityApiTest.php b/tests/Controller/Cart/CartChangeItemQuantityApiTest.php
index e5118fb6a..ac957ab4f 100644
--- a/tests/Controller/Cart/CartChangeItemQuantityApiTest.php
+++ b/tests/Controller/Cart/CartChangeItemQuantityApiTest.php
@@ -7,8 +7,8 @@
 use League\Tactician\CommandBus;
 use Sylius\Component\Core\Model\OrderItemInterface;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\PickupCart;
-use Sylius\ShopApiPlugin\Command\PutSimpleItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\PickupCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutSimpleItemToCart;
 use Symfony\Component\HttpFoundation\Response;
 use Tests\Sylius\ShopApiPlugin\Controller\JsonApiTestCase;
 
diff --git a/tests/Controller/Cart/CartDropCartApiTest.php b/tests/Controller/Cart/CartDropCartApiTest.php
index ccf5471a7..a8b387331 100644
--- a/tests/Controller/Cart/CartDropCartApiTest.php
+++ b/tests/Controller/Cart/CartDropCartApiTest.php
@@ -6,12 +6,12 @@
 
 use League\Tactician\CommandBus;
 use Sylius\Component\Core\Model\OrderInterface;
-use Sylius\ShopApiPlugin\Command\AddressOrder;
-use Sylius\ShopApiPlugin\Command\ChoosePaymentMethod;
-use Sylius\ShopApiPlugin\Command\ChooseShippingMethod;
-use Sylius\ShopApiPlugin\Command\CompleteOrder;
-use Sylius\ShopApiPlugin\Command\PickupCart;
-use Sylius\ShopApiPlugin\Command\PutSimpleItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\AddressOrder;
+use Sylius\ShopApiPlugin\Command\Cart\ChoosePaymentMethod;
+use Sylius\ShopApiPlugin\Command\Cart\ChooseShippingMethod;
+use Sylius\ShopApiPlugin\Command\Cart\CompleteOrder;
+use Sylius\ShopApiPlugin\Command\Cart\PickupCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutSimpleItemToCart;
 use Sylius\ShopApiPlugin\Model\Address;
 use Symfony\Component\HttpFoundation\Response;
 use Tests\Sylius\ShopApiPlugin\Controller\JsonApiTestCase;
diff --git a/tests/Controller/Cart/CartPickupApiTest.php b/tests/Controller/Cart/CartPickupApiTest.php
index b57fa8568..04f8c95e9 100644
--- a/tests/Controller/Cart/CartPickupApiTest.php
+++ b/tests/Controller/Cart/CartPickupApiTest.php
@@ -6,7 +6,7 @@
 
 use League\Tactician\CommandBus;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\PickupCart;
+use Sylius\ShopApiPlugin\Command\Cart\PickupCart;
 use Symfony\Component\HttpFoundation\Response;
 use Tests\Sylius\ShopApiPlugin\Controller\JsonApiTestCase;
 use Tests\Sylius\ShopApiPlugin\Controller\Utils\ShopUserLoginTrait;
diff --git a/tests/Controller/Cart/CartPutItemToCartApiTest.php b/tests/Controller/Cart/CartPutItemToCartApiTest.php
index 16062f1c9..77a5c6e6b 100644
--- a/tests/Controller/Cart/CartPutItemToCartApiTest.php
+++ b/tests/Controller/Cart/CartPutItemToCartApiTest.php
@@ -6,12 +6,12 @@
 
 use League\Tactician\CommandBus;
 use Sylius\Component\Core\Model\OrderInterface;
-use Sylius\ShopApiPlugin\Command\AddressOrder;
-use Sylius\ShopApiPlugin\Command\ChoosePaymentMethod;
-use Sylius\ShopApiPlugin\Command\ChooseShippingMethod;
-use Sylius\ShopApiPlugin\Command\CompleteOrder;
-use Sylius\ShopApiPlugin\Command\PickupCart;
-use Sylius\ShopApiPlugin\Command\PutSimpleItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\AddressOrder;
+use Sylius\ShopApiPlugin\Command\Cart\ChoosePaymentMethod;
+use Sylius\ShopApiPlugin\Command\Cart\ChooseShippingMethod;
+use Sylius\ShopApiPlugin\Command\Cart\CompleteOrder;
+use Sylius\ShopApiPlugin\Command\Cart\PickupCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutSimpleItemToCart;
 use Sylius\ShopApiPlugin\Model\Address;
 use Symfony\Component\HttpFoundation\Response;
 use Tests\Sylius\ShopApiPlugin\Controller\JsonApiTestCase;
diff --git a/tests/Controller/Cart/CartPutItemsToCartApiTest.php b/tests/Controller/Cart/CartPutItemsToCartApiTest.php
index 248dfcad9..7b9d9b370 100644
--- a/tests/Controller/Cart/CartPutItemsToCartApiTest.php
+++ b/tests/Controller/Cart/CartPutItemsToCartApiTest.php
@@ -5,7 +5,7 @@
 namespace Tests\Sylius\ShopApiPlugin\Controller\Cart;
 
 use League\Tactician\CommandBus;
-use Sylius\ShopApiPlugin\Command\PickupCart;
+use Sylius\ShopApiPlugin\Command\Cart\PickupCart;
 use Symfony\Component\HttpFoundation\Response;
 use Tests\Sylius\ShopApiPlugin\Controller\JsonApiTestCase;
 
diff --git a/tests/Controller/Cart/CartRemoveCouponShopApiTest.php b/tests/Controller/Cart/CartRemoveCouponShopApiTest.php
index 609ccffea..41b3ff6cd 100644
--- a/tests/Controller/Cart/CartRemoveCouponShopApiTest.php
+++ b/tests/Controller/Cart/CartRemoveCouponShopApiTest.php
@@ -5,9 +5,9 @@
 namespace Tests\Sylius\ShopApiPlugin\Controller\Cart;
 
 use League\Tactician\CommandBus;
-use Sylius\ShopApiPlugin\Command\AddCoupon;
-use Sylius\ShopApiPlugin\Command\PickupCart;
-use Sylius\ShopApiPlugin\Command\PutSimpleItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\AddCoupon;
+use Sylius\ShopApiPlugin\Command\Cart\PickupCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutSimpleItemToCart;
 use Symfony\Component\HttpFoundation\Response;
 use Tests\Sylius\ShopApiPlugin\Controller\JsonApiTestCase;
 
diff --git a/tests/Controller/Cart/CartRemoveItemFromCartApiTest.php b/tests/Controller/Cart/CartRemoveItemFromCartApiTest.php
index 563095d73..6d092eca1 100644
--- a/tests/Controller/Cart/CartRemoveItemFromCartApiTest.php
+++ b/tests/Controller/Cart/CartRemoveItemFromCartApiTest.php
@@ -7,9 +7,9 @@
 use League\Tactician\CommandBus;
 use Sylius\Component\Core\Model\OrderItemInterface;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\PickupCart;
-use Sylius\ShopApiPlugin\Command\PutSimpleItemToCart;
-use Sylius\ShopApiPlugin\Command\PutVariantBasedConfigurableItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\PickupCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutSimpleItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutVariantBasedConfigurableItemToCart;
 use Symfony\Component\HttpFoundation\Response;
 use Tests\Sylius\ShopApiPlugin\Controller\JsonApiTestCase;
 
diff --git a/tests/Controller/Cart/CartSummarizeApiTest.php b/tests/Controller/Cart/CartSummarizeApiTest.php
index b992bf366..54788c738 100644
--- a/tests/Controller/Cart/CartSummarizeApiTest.php
+++ b/tests/Controller/Cart/CartSummarizeApiTest.php
@@ -5,9 +5,9 @@
 namespace Tests\Sylius\ShopApiPlugin\Controller\Cart;
 
 use League\Tactician\CommandBus;
-use Sylius\ShopApiPlugin\Command\AddCoupon;
-use Sylius\ShopApiPlugin\Command\PickupCart;
-use Sylius\ShopApiPlugin\Command\PutSimpleItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\AddCoupon;
+use Sylius\ShopApiPlugin\Command\Cart\PickupCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutSimpleItemToCart;
 use Symfony\Component\HttpFoundation\Response;
 use Tests\Sylius\ShopApiPlugin\Controller\JsonApiTestCase;
 
diff --git a/tests/Controller/Checkout/CheckoutAddressApiTest.php b/tests/Controller/Checkout/CheckoutAddressApiTest.php
index f10c3ccae..d5bc663bf 100644
--- a/tests/Controller/Checkout/CheckoutAddressApiTest.php
+++ b/tests/Controller/Checkout/CheckoutAddressApiTest.php
@@ -5,8 +5,8 @@
 namespace Tests\Sylius\ShopApiPlugin\Controller\Checkout;
 
 use League\Tactician\CommandBus;
-use Sylius\ShopApiPlugin\Command\PickupCart;
-use Sylius\ShopApiPlugin\Command\PutSimpleItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\PickupCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutSimpleItemToCart;
 use Symfony\Component\HttpFoundation\Response;
 use Tests\Sylius\ShopApiPlugin\Controller\JsonApiTestCase;
 
diff --git a/tests/Controller/Checkout/CheckoutChoosePaymentMethodApiTest.php b/tests/Controller/Checkout/CheckoutChoosePaymentMethodApiTest.php
index f5f2c2dd5..94cb9fd50 100644
--- a/tests/Controller/Checkout/CheckoutChoosePaymentMethodApiTest.php
+++ b/tests/Controller/Checkout/CheckoutChoosePaymentMethodApiTest.php
@@ -5,10 +5,10 @@
 namespace Tests\Sylius\ShopApiPlugin\Controller\Checkout;
 
 use League\Tactician\CommandBus;
-use Sylius\ShopApiPlugin\Command\AddressOrder;
-use Sylius\ShopApiPlugin\Command\ChooseShippingMethod;
-use Sylius\ShopApiPlugin\Command\PickupCart;
-use Sylius\ShopApiPlugin\Command\PutSimpleItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\AddressOrder;
+use Sylius\ShopApiPlugin\Command\Cart\ChooseShippingMethod;
+use Sylius\ShopApiPlugin\Command\Cart\PickupCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutSimpleItemToCart;
 use Sylius\ShopApiPlugin\Model\Address;
 use Symfony\Component\HttpFoundation\Response;
 use Tests\Sylius\ShopApiPlugin\Controller\JsonApiTestCase;
diff --git a/tests/Controller/Checkout/CheckoutChooseShippingMethodApiTest.php b/tests/Controller/Checkout/CheckoutChooseShippingMethodApiTest.php
index c61bc1295..a6e1a0dc9 100644
--- a/tests/Controller/Checkout/CheckoutChooseShippingMethodApiTest.php
+++ b/tests/Controller/Checkout/CheckoutChooseShippingMethodApiTest.php
@@ -5,9 +5,9 @@
 namespace Tests\Sylius\ShopApiPlugin\Controller\Checkout;
 
 use League\Tactician\CommandBus;
-use Sylius\ShopApiPlugin\Command\AddressOrder;
-use Sylius\ShopApiPlugin\Command\PickupCart;
-use Sylius\ShopApiPlugin\Command\PutSimpleItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\AddressOrder;
+use Sylius\ShopApiPlugin\Command\Cart\PickupCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutSimpleItemToCart;
 use Sylius\ShopApiPlugin\Model\Address;
 use Symfony\Component\HttpFoundation\Response;
 use Tests\Sylius\ShopApiPlugin\Controller\JsonApiTestCase;
diff --git a/tests/Controller/Checkout/CheckoutCompleteOrderApiTest.php b/tests/Controller/Checkout/CheckoutCompleteOrderApiTest.php
index a0b2d13c9..d5a720a3f 100644
--- a/tests/Controller/Checkout/CheckoutCompleteOrderApiTest.php
+++ b/tests/Controller/Checkout/CheckoutCompleteOrderApiTest.php
@@ -5,11 +5,11 @@
 namespace Tests\Sylius\ShopApiPlugin\Controller\Checkout;
 
 use League\Tactician\CommandBus;
-use Sylius\ShopApiPlugin\Command\AddressOrder;
-use Sylius\ShopApiPlugin\Command\ChoosePaymentMethod;
-use Sylius\ShopApiPlugin\Command\ChooseShippingMethod;
-use Sylius\ShopApiPlugin\Command\PickupCart;
-use Sylius\ShopApiPlugin\Command\PutSimpleItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\AddressOrder;
+use Sylius\ShopApiPlugin\Command\Cart\ChoosePaymentMethod;
+use Sylius\ShopApiPlugin\Command\Cart\ChooseShippingMethod;
+use Sylius\ShopApiPlugin\Command\Cart\PickupCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutSimpleItemToCart;
 use Sylius\ShopApiPlugin\Model\Address;
 use Symfony\Component\HttpFoundation\Response;
 use Tests\Sylius\ShopApiPlugin\Controller\JsonApiTestCase;
diff --git a/tests/Controller/Checkout/CheckoutShowAvailablePaymentMethodsShopApiTest.php b/tests/Controller/Checkout/CheckoutShowAvailablePaymentMethodsShopApiTest.php
index ca32f5e51..54c6fda82 100644
--- a/tests/Controller/Checkout/CheckoutShowAvailablePaymentMethodsShopApiTest.php
+++ b/tests/Controller/Checkout/CheckoutShowAvailablePaymentMethodsShopApiTest.php
@@ -5,10 +5,10 @@
 namespace Tests\Sylius\ShopApiPlugin\Controller\Checkout;
 
 use League\Tactician\CommandBus;
-use Sylius\ShopApiPlugin\Command\AddressOrder;
-use Sylius\ShopApiPlugin\Command\ChooseShippingMethod;
-use Sylius\ShopApiPlugin\Command\PickupCart;
-use Sylius\ShopApiPlugin\Command\PutSimpleItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\AddressOrder;
+use Sylius\ShopApiPlugin\Command\Cart\ChooseShippingMethod;
+use Sylius\ShopApiPlugin\Command\Cart\PickupCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutSimpleItemToCart;
 use Sylius\ShopApiPlugin\Model\Address;
 use Symfony\Component\HttpFoundation\Response;
 use Tests\Sylius\ShopApiPlugin\Controller\JsonApiTestCase;
diff --git a/tests/Controller/Checkout/CheckoutShowAvailableShippingMethodsShopApiTest.php b/tests/Controller/Checkout/CheckoutShowAvailableShippingMethodsShopApiTest.php
index 89408e7b7..e869338d3 100644
--- a/tests/Controller/Checkout/CheckoutShowAvailableShippingMethodsShopApiTest.php
+++ b/tests/Controller/Checkout/CheckoutShowAvailableShippingMethodsShopApiTest.php
@@ -5,9 +5,9 @@
 namespace Tests\Sylius\ShopApiPlugin\Controller\Checkout;
 
 use League\Tactician\CommandBus;
-use Sylius\ShopApiPlugin\Command\AddressOrder;
-use Sylius\ShopApiPlugin\Command\PickupCart;
-use Sylius\ShopApiPlugin\Command\PutSimpleItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\AddressOrder;
+use Sylius\ShopApiPlugin\Command\Cart\PickupCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutSimpleItemToCart;
 use Sylius\ShopApiPlugin\Model\Address;
 use Symfony\Component\HttpFoundation\Response;
 use Tests\Sylius\ShopApiPlugin\Controller\JsonApiTestCase;
diff --git a/tests/Controller/Checkout/CheckoutSummarizeApiTest.php b/tests/Controller/Checkout/CheckoutSummarizeApiTest.php
index d02ef662f..198a03c93 100644
--- a/tests/Controller/Checkout/CheckoutSummarizeApiTest.php
+++ b/tests/Controller/Checkout/CheckoutSummarizeApiTest.php
@@ -7,10 +7,10 @@
 use League\Tactician\CommandBus;
 use Sylius\Component\Core\Model\OrderItemInterface;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
-use Sylius\ShopApiPlugin\Command\AddressOrder;
-use Sylius\ShopApiPlugin\Command\ChooseShippingMethod;
-use Sylius\ShopApiPlugin\Command\PickupCart;
-use Sylius\ShopApiPlugin\Command\PutSimpleItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\AddressOrder;
+use Sylius\ShopApiPlugin\Command\Cart\ChooseShippingMethod;
+use Sylius\ShopApiPlugin\Command\Cart\PickupCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutSimpleItemToCart;
 use Sylius\ShopApiPlugin\Model\Address;
 use Symfony\Component\HttpFoundation\Response;
 use Tests\Sylius\ShopApiPlugin\Controller\JsonApiTestCase;
diff --git a/tests/Request/AddCouponRequestTest.php b/tests/Request/AddCouponRequestTest.php
index 3016793e4..47712dd9c 100644
--- a/tests/Request/AddCouponRequestTest.php
+++ b/tests/Request/AddCouponRequestTest.php
@@ -5,7 +5,7 @@
 namespace Tests\Sylius\ShopApiPlugin\Request;
 
 use PHPUnit\Framework\TestCase;
-use Sylius\ShopApiPlugin\Command\AddCoupon;
+use Sylius\ShopApiPlugin\Command\Cart\AddCoupon;
 use Sylius\ShopApiPlugin\Request\AddCouponRequest;
 use Symfony\Component\HttpFoundation\Request;
 
diff --git a/tests/Request/AddProductReviewByCodeRequestTest.php b/tests/Request/AddProductReviewByCodeRequestTest.php
index 7666683f2..e5a8c5142 100644
--- a/tests/Request/AddProductReviewByCodeRequestTest.php
+++ b/tests/Request/AddProductReviewByCodeRequestTest.php
@@ -5,7 +5,7 @@
 namespace Tests\Sylius\ShopApiPlugin\Request;
 
 use PHPUnit\Framework\TestCase;
-use Sylius\ShopApiPlugin\Command\AddProductReviewByCode;
+use Sylius\ShopApiPlugin\Command\Product\AddProductReviewByCode;
 use Sylius\ShopApiPlugin\Request\AddProductReviewByCodeRequest;
 use Symfony\Component\HttpFoundation\Request;
 
diff --git a/tests/Request/AddProductReviewBySlugRequestTest.php b/tests/Request/AddProductReviewBySlugRequestTest.php
index 21461f4fe..ad319b6d4 100644
--- a/tests/Request/AddProductReviewBySlugRequestTest.php
+++ b/tests/Request/AddProductReviewBySlugRequestTest.php
@@ -5,7 +5,7 @@
 namespace Tests\Sylius\ShopApiPlugin\Request;
 
 use PHPUnit\Framework\TestCase;
-use Sylius\ShopApiPlugin\Command\AddProductReviewBySlug;
+use Sylius\ShopApiPlugin\Command\Product\AddProductReviewBySlug;
 use Sylius\ShopApiPlugin\Request\AddProductReviewBySlugRequest;
 use Symfony\Component\HttpFoundation\Request;
 
diff --git a/tests/Request/ChangeItemQuantityRequestTest.php b/tests/Request/ChangeItemQuantityRequestTest.php
index ec6e5fde9..04f14bd66 100644
--- a/tests/Request/ChangeItemQuantityRequestTest.php
+++ b/tests/Request/ChangeItemQuantityRequestTest.php
@@ -5,7 +5,7 @@
 namespace Tests\Sylius\ShopApiPlugin\Request;
 
 use PHPUnit\Framework\TestCase;
-use Sylius\ShopApiPlugin\Command\ChangeItemQuantity;
+use Sylius\ShopApiPlugin\Command\Cart\ChangeItemQuantity;
 use Sylius\ShopApiPlugin\Request\ChangeItemQuantityRequest;
 use Symfony\Component\HttpFoundation\Request;
 
diff --git a/tests/Request/DropCartRequestTest.php b/tests/Request/DropCartRequestTest.php
index 4f9ea452b..a4a35bccb 100644
--- a/tests/Request/DropCartRequestTest.php
+++ b/tests/Request/DropCartRequestTest.php
@@ -5,7 +5,7 @@
 namespace Tests\Sylius\ShopApiPlugin\Request;
 
 use PHPUnit\Framework\TestCase;
-use Sylius\ShopApiPlugin\Command\DropCart;
+use Sylius\ShopApiPlugin\Command\Cart\DropCart;
 use Sylius\ShopApiPlugin\Request\DropCartRequest;
 use Symfony\Component\HttpFoundation\Request;
 
diff --git a/tests/Request/PutOptionBasedConfigurableItemToCartRequestTest.php b/tests/Request/PutOptionBasedConfigurableItemToCartRequestTest.php
index df0c27a06..c95a73f11 100644
--- a/tests/Request/PutOptionBasedConfigurableItemToCartRequestTest.php
+++ b/tests/Request/PutOptionBasedConfigurableItemToCartRequestTest.php
@@ -5,7 +5,7 @@
 namespace Tests\Sylius\ShopApiPlugin\Request;
 
 use PHPUnit\Framework\TestCase;
-use Sylius\ShopApiPlugin\Command\PutOptionBasedConfigurableItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutOptionBasedConfigurableItemToCart;
 use Sylius\ShopApiPlugin\Request\PutOptionBasedConfigurableItemToCartRequest;
 use Symfony\Component\HttpFoundation\Request;
 
diff --git a/tests/Request/PutSimpleItemToCartRequestTest.php b/tests/Request/PutSimpleItemToCartRequestTest.php
index 34c0e89e5..d375adb91 100644
--- a/tests/Request/PutSimpleItemToCartRequestTest.php
+++ b/tests/Request/PutSimpleItemToCartRequestTest.php
@@ -5,7 +5,7 @@
 namespace Tests\Sylius\ShopApiPlugin\Request;
 
 use PHPUnit\Framework\TestCase;
-use Sylius\ShopApiPlugin\Command\PutSimpleItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutSimpleItemToCart;
 use Sylius\ShopApiPlugin\Request\PutSimpleItemToCartRequest;
 use Symfony\Component\HttpFoundation\Request;
 
diff --git a/tests/Request/PutVariantBasedConfigurableItemToCartRequestTest.php b/tests/Request/PutVariantBasedConfigurableItemToCartRequestTest.php
index eefba7744..feeb4f077 100644
--- a/tests/Request/PutVariantBasedConfigurableItemToCartRequestTest.php
+++ b/tests/Request/PutVariantBasedConfigurableItemToCartRequestTest.php
@@ -5,7 +5,7 @@
 namespace Tests\Sylius\ShopApiPlugin\Request;
 
 use PHPUnit\Framework\TestCase;
-use Sylius\ShopApiPlugin\Command\PutVariantBasedConfigurableItemToCart;
+use Sylius\ShopApiPlugin\Command\Cart\PutVariantBasedConfigurableItemToCart;
 use Sylius\ShopApiPlugin\Request\PutVariantBasedConfigurableItemToCartRequest;
 use Symfony\Component\HttpFoundation\Request;
 
diff --git a/tests/Request/ResendVerificationTokenRequestTest.php b/tests/Request/ResendVerificationTokenRequestTest.php
index 9618ea612..baebb8bd5 100644
--- a/tests/Request/ResendVerificationTokenRequestTest.php
+++ b/tests/Request/ResendVerificationTokenRequestTest.php
@@ -5,7 +5,7 @@
 namespace Tests\Sylius\ShopApiPlugin\Request;
 
 use PHPUnit\Framework\TestCase;
-use Sylius\ShopApiPlugin\Command\SendVerificationToken;
+use Sylius\ShopApiPlugin\Command\Customer\SendVerificationToken;
 use Sylius\ShopApiPlugin\Request\ResendVerificationTokenRequest;
 use Symfony\Component\HttpFoundation\Request;
 
diff --git a/tests/Request/UpdateCustomerRequestTest.php b/tests/Request/UpdateCustomerRequestTest.php
index c6233436a..434fb7bbf 100644
--- a/tests/Request/UpdateCustomerRequestTest.php
+++ b/tests/Request/UpdateCustomerRequestTest.php
@@ -5,7 +5,7 @@
 namespace Tests\Sylius\ShopApiPlugin\Request;
 
 use PHPUnit\Framework\TestCase;
-use Sylius\ShopApiPlugin\Command\UpdateCustomer;
+use Sylius\ShopApiPlugin\Command\Customer\UpdateCustomer;
 use Sylius\ShopApiPlugin\Request\UpdateCustomerRequest;
 use Symfony\Component\HttpFoundation\Request;
 
diff --git a/tests/Request/VerifyAccountRequestTest.php b/tests/Request/VerifyAccountRequestTest.php
index c0faed7f1..47a0e4bea 100644
--- a/tests/Request/VerifyAccountRequestTest.php
+++ b/tests/Request/VerifyAccountRequestTest.php
@@ -5,7 +5,7 @@
 namespace Tests\Sylius\ShopApiPlugin\Request;
 
 use PHPUnit\Framework\TestCase;
-use Sylius\ShopApiPlugin\Command\VerifyAccount;
+use Sylius\ShopApiPlugin\Command\Customer\VerifyAccount;
 use Sylius\ShopApiPlugin\Request\VerifyAccountRequest;
 use Symfony\Component\HttpFoundation\Request;