diff --git a/src/Imprink.Application/Domains/Categories/CreateCategoryHandler.cs b/src/Imprink.Application/Categories/Commands/CreateCategoryHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Categories/CreateCategoryHandler.cs
rename to src/Imprink.Application/Categories/Commands/CreateCategoryHandler.cs
diff --git a/src/Imprink.Application/Domains/Categories/DeleteCategoryHandler.cs b/src/Imprink.Application/Categories/Commands/DeleteCategoryHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Categories/DeleteCategoryHandler.cs
rename to src/Imprink.Application/Categories/Commands/DeleteCategoryHandler.cs
diff --git a/src/Imprink.Application/Domains/Categories/GetCategoriesHandler.cs b/src/Imprink.Application/Categories/Commands/GetCategoriesHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Categories/GetCategoriesHandler.cs
rename to src/Imprink.Application/Categories/Commands/GetCategoriesHandler.cs
diff --git a/src/Imprink.Application/Domains/Categories/UpdateCategoryHandler.cs b/src/Imprink.Application/Categories/Commands/UpdateCategoryHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Categories/UpdateCategoryHandler.cs
rename to src/Imprink.Application/Categories/Commands/UpdateCategoryHandler.cs
diff --git a/src/Imprink.Application/Domains/Categories/Dtos/CategoryDto.cs b/src/Imprink.Application/Categories/Dtos/CategoryDto.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Categories/Dtos/CategoryDto.cs
rename to src/Imprink.Application/Categories/Dtos/CategoryDto.cs
diff --git a/src/Imprink.Application/Validation/Categories/CreateCategoryCommandValidator.cs b/src/Imprink.Application/Categories/Validation/CreateCategoryCommandValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Categories/CreateCategoryCommandValidator.cs
rename to src/Imprink.Application/Categories/Validation/CreateCategoryCommandValidator.cs
diff --git a/src/Imprink.Application/Validation/Categories/DeleteCategoryCommandValidator.cs b/src/Imprink.Application/Categories/Validation/DeleteCategoryCommandValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Categories/DeleteCategoryCommandValidator.cs
rename to src/Imprink.Application/Categories/Validation/DeleteCategoryCommandValidator.cs
diff --git a/src/Imprink.Application/Validation/Categories/UpdateCategoryCommandValidator.cs b/src/Imprink.Application/Categories/Validation/UpdateCategoryCommandValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Categories/UpdateCategoryCommandValidator.cs
rename to src/Imprink.Application/Categories/Validation/UpdateCategoryCommandValidator.cs
diff --git a/src/Imprink.Application/Mappings/MappingProfile.cs b/src/Imprink.Application/MappingProfile.cs
similarity index 100%
rename from src/Imprink.Application/Mappings/MappingProfile.cs
rename to src/Imprink.Application/MappingProfile.cs
diff --git a/src/Imprink.Application/Validation/Models/OrderFilterParametersValidator.cs b/src/Imprink.Application/Orders/Validation/OrderFilterParametersValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Models/OrderFilterParametersValidator.cs
rename to src/Imprink.Application/Orders/Validation/OrderFilterParametersValidator.cs
diff --git a/src/Imprink.Application/Domains/ProductVariants/CreateProductVariantHandler.cs b/src/Imprink.Application/ProductVariants/Commands/CreateProductVariantHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/ProductVariants/CreateProductVariantHandler.cs
rename to src/Imprink.Application/ProductVariants/Commands/CreateProductVariantHandler.cs
diff --git a/src/Imprink.Application/Domains/ProductVariants/DeleteProductVariantHandler.cs b/src/Imprink.Application/ProductVariants/Commands/DeleteProductVariantHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/ProductVariants/DeleteProductVariantHandler.cs
rename to src/Imprink.Application/ProductVariants/Commands/DeleteProductVariantHandler.cs
diff --git a/src/Imprink.Application/Domains/ProductVariants/GetProductVariantsHandler.cs b/src/Imprink.Application/ProductVariants/Commands/GetProductVariantsHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/ProductVariants/GetProductVariantsHandler.cs
rename to src/Imprink.Application/ProductVariants/Commands/GetProductVariantsHandler.cs
diff --git a/src/Imprink.Application/Domains/ProductVariants/UpdateProductVariantHandler.cs b/src/Imprink.Application/ProductVariants/Commands/UpdateProductVariantHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/ProductVariants/UpdateProductVariantHandler.cs
rename to src/Imprink.Application/ProductVariants/Commands/UpdateProductVariantHandler.cs
diff --git a/src/Imprink.Application/Domains/ProductVariants/Dtos/ProductVariantDto.cs b/src/Imprink.Application/ProductVariants/Dtos/ProductVariantDto.cs
similarity index 100%
rename from src/Imprink.Application/Domains/ProductVariants/Dtos/ProductVariantDto.cs
rename to src/Imprink.Application/ProductVariants/Dtos/ProductVariantDto.cs
diff --git a/src/Imprink.Application/Validation/ProductVariants/CreateProducVariantCommandValidator.cs b/src/Imprink.Application/ProductVariants/Validation/CreateProducVariantCommandValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/ProductVariants/CreateProducVariantCommandValidator.cs
rename to src/Imprink.Application/ProductVariants/Validation/CreateProducVariantCommandValidator.cs
diff --git a/src/Imprink.Application/Validation/ProductVariants/DeleteProductVariantCommandValidator.cs b/src/Imprink.Application/ProductVariants/Validation/DeleteProductVariantCommandValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/ProductVariants/DeleteProductVariantCommandValidator.cs
rename to src/Imprink.Application/ProductVariants/Validation/DeleteProductVariantCommandValidator.cs
diff --git a/src/Imprink.Application/Validation/ProductVariants/GetProductVariantsQueryValidator.cs b/src/Imprink.Application/ProductVariants/Validation/GetProductVariantsQueryValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/ProductVariants/GetProductVariantsQueryValidator.cs
rename to src/Imprink.Application/ProductVariants/Validation/GetProductVariantsQueryValidator.cs
diff --git a/src/Imprink.Application/Validation/ProductVariants/UpdateProductVariantCommandValidator.cs b/src/Imprink.Application/ProductVariants/Validation/UpdateProductVariantCommandValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/ProductVariants/UpdateProductVariantCommandValidator.cs
rename to src/Imprink.Application/ProductVariants/Validation/UpdateProductVariantCommandValidator.cs
diff --git a/src/Imprink.Application/Domains/Products/CreateProductHandler.cs b/src/Imprink.Application/Products/Commands/CreateProductHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Products/CreateProductHandler.cs
rename to src/Imprink.Application/Products/Commands/CreateProductHandler.cs
diff --git a/src/Imprink.Application/Domains/Products/DeleteProductHandler.cs b/src/Imprink.Application/Products/Commands/DeleteProductHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Products/DeleteProductHandler.cs
rename to src/Imprink.Application/Products/Commands/DeleteProductHandler.cs
diff --git a/src/Imprink.Application/Domains/Products/GetProductsHandler.cs b/src/Imprink.Application/Products/Commands/GetProductsHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Products/GetProductsHandler.cs
rename to src/Imprink.Application/Products/Commands/GetProductsHandler.cs
diff --git a/src/Imprink.Application/Domains/Products/UpdateProductCommand.cs b/src/Imprink.Application/Products/Commands/UpdateProductCommand.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Products/UpdateProductCommand.cs
rename to src/Imprink.Application/Products/Commands/UpdateProductCommand.cs
diff --git a/src/Imprink.Application/Domains/Products/Dtos/PagedResultDto.cs b/src/Imprink.Application/Products/Dtos/PagedResultDto.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Products/Dtos/PagedResultDto.cs
rename to src/Imprink.Application/Products/Dtos/PagedResultDto.cs
diff --git a/src/Imprink.Application/Domains/Products/Dtos/ProductDto.cs b/src/Imprink.Application/Products/Dtos/ProductDto.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Products/Dtos/ProductDto.cs
rename to src/Imprink.Application/Products/Dtos/ProductDto.cs
diff --git a/src/Imprink.Application/Mappings/ProductMappingProfile.cs b/src/Imprink.Application/Products/Mappings/ProductMappingProfile.cs
similarity index 100%
rename from src/Imprink.Application/Mappings/ProductMappingProfile.cs
rename to src/Imprink.Application/Products/Mappings/ProductMappingProfile.cs
diff --git a/src/Imprink.Application/Validation/Products/CreateProductCommandValidator.cs b/src/Imprink.Application/Products/Validation/CreateProductCommandValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Products/CreateProductCommandValidator.cs
rename to src/Imprink.Application/Products/Validation/CreateProductCommandValidator.cs
diff --git a/src/Imprink.Application/Validation/Products/DeleteProductCommandValidator.cs b/src/Imprink.Application/Products/Validation/DeleteProductCommandValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Products/DeleteProductCommandValidator.cs
rename to src/Imprink.Application/Products/Validation/DeleteProductCommandValidator.cs
diff --git a/src/Imprink.Application/Validation/Products/GetProductsQueryValidator.cs b/src/Imprink.Application/Products/Validation/GetProductsQueryValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Products/GetProductsQueryValidator.cs
rename to src/Imprink.Application/Products/Validation/GetProductsQueryValidator.cs
diff --git a/src/Imprink.Application/Validation/Models/ProductFilterParametersValidator.cs b/src/Imprink.Application/Products/Validation/ProductFilterParametersValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Models/ProductFilterParametersValidator.cs
rename to src/Imprink.Application/Products/Validation/ProductFilterParametersValidator.cs
diff --git a/src/Imprink.Application/Validation/Products/UpdateProductCommandValidator.cs b/src/Imprink.Application/Products/Validation/UpdateProductCommandValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Products/UpdateProductCommandValidator.cs
rename to src/Imprink.Application/Products/Validation/UpdateProductCommandValidator.cs
diff --git a/src/Imprink.Application/Domains/Users/DeleteUserRoleHandler.cs b/src/Imprink.Application/Users/Commands/DeleteUserRoleHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Users/DeleteUserRoleHandler.cs
rename to src/Imprink.Application/Users/Commands/DeleteUserRoleHandler.cs
diff --git a/src/Imprink.Application/Domains/Users/GetAllRolesHandler.cs b/src/Imprink.Application/Users/Commands/GetAllRolesHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Users/GetAllRolesHandler.cs
rename to src/Imprink.Application/Users/Commands/GetAllRolesHandler.cs
diff --git a/src/Imprink.Application/Domains/Users/GetUserRolesHandler.cs b/src/Imprink.Application/Users/Commands/GetUserRolesHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Users/GetUserRolesHandler.cs
rename to src/Imprink.Application/Users/Commands/GetUserRolesHandler.cs
diff --git a/src/Imprink.Application/Domains/Users/SetUserFullNameHandler.cs b/src/Imprink.Application/Users/Commands/SetUserFullNameHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Users/SetUserFullNameHandler.cs
rename to src/Imprink.Application/Users/Commands/SetUserFullNameHandler.cs
diff --git a/src/Imprink.Application/Domains/Users/SetUserPhoneHandler.cs b/src/Imprink.Application/Users/Commands/SetUserPhoneHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Users/SetUserPhoneHandler.cs
rename to src/Imprink.Application/Users/Commands/SetUserPhoneHandler.cs
diff --git a/src/Imprink.Application/Domains/Users/SetUserRoleHandler.cs b/src/Imprink.Application/Users/Commands/SetUserRoleHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Users/SetUserRoleHandler.cs
rename to src/Imprink.Application/Users/Commands/SetUserRoleHandler.cs
diff --git a/src/Imprink.Application/Domains/Users/SyncUserHandler.cs b/src/Imprink.Application/Users/Commands/SyncUserHandler.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Users/SyncUserHandler.cs
rename to src/Imprink.Application/Users/Commands/SyncUserHandler.cs
diff --git a/src/Imprink.Application/Domains/Users/Dtos/RoleDto.cs b/src/Imprink.Application/Users/Dtos/RoleDto.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Users/Dtos/RoleDto.cs
rename to src/Imprink.Application/Users/Dtos/RoleDto.cs
diff --git a/src/Imprink.Application/Domains/Users/Dtos/UserDto.cs b/src/Imprink.Application/Users/Dtos/UserDto.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Users/Dtos/UserDto.cs
rename to src/Imprink.Application/Users/Dtos/UserDto.cs
diff --git a/src/Imprink.Application/Domains/Users/Dtos/UserRoleDto.cs b/src/Imprink.Application/Users/Dtos/UserRoleDto.cs
similarity index 100%
rename from src/Imprink.Application/Domains/Users/Dtos/UserRoleDto.cs
rename to src/Imprink.Application/Users/Dtos/UserRoleDto.cs
diff --git a/src/Imprink.Application/Mappings/UserMappingProfile.cs b/src/Imprink.Application/Users/Mappings/UserMappingProfile.cs
similarity index 100%
rename from src/Imprink.Application/Mappings/UserMappingProfile.cs
rename to src/Imprink.Application/Users/Mappings/UserMappingProfile.cs
diff --git a/src/Imprink.Application/Services/ICurrentUserService.cs b/src/Imprink.Application/Users/Services/ICurrentUserService.cs
similarity index 100%
rename from src/Imprink.Application/Services/ICurrentUserService.cs
rename to src/Imprink.Application/Users/Services/ICurrentUserService.cs
diff --git a/src/Imprink.Application/Validation/Models/Auth0UserValidator.cs b/src/Imprink.Application/Users/Validation/Auth0UserValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Models/Auth0UserValidator.cs
rename to src/Imprink.Application/Users/Validation/Auth0UserValidator.cs
diff --git a/src/Imprink.Application/Validation/Users/SetUserFullNameCommandValidator.cs b/src/Imprink.Application/Users/Validation/SetUserFullNameCommandValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Users/SetUserFullNameCommandValidator.cs
rename to src/Imprink.Application/Users/Validation/SetUserFullNameCommandValidator.cs
diff --git a/src/Imprink.Application/Validation/Users/SetUserPhoneCommandValidator.cs b/src/Imprink.Application/Users/Validation/SetUserPhoneCommandValidator.cs
similarity index 100%
rename from src/Imprink.Application/Validation/Users/SetUserPhoneCommandValidator.cs
rename to src/Imprink.Application/Users/Validation/SetUserPhoneCommandValidator.cs