diff --git a/Model/Request/RequestCalculate.php b/Model/Request/RequestCalculate.php
index f0eb59e..a5dad7b 100644
--- a/Model/Request/RequestCalculate.php
+++ b/Model/Request/RequestCalculate.php
@@ -1,13 +1,14 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Request;
 
-use Intaro\CRMBundle\Entity\Model\DeliveryTime;
+use RetailCrm\DeliveryModuleBundle\Model\DeliveryTime;
 use JMS\Serializer\Annotation as Serializer;
+use RetailCrm\DeliveryModuleBundle\Model\Traits\ExtraDataTrait;
 
 class RequestCalculate
 {
-    use Traits\ExtraDataTrait;
+    use ExtraDataTrait;
 
     /**
      * Адрес отгрузки.
@@ -34,7 +35,7 @@ class RequestCalculate
     /**
      * Набор упаковок.
      *
-     * @var Intaro\CRMDeliveryBundle\Form\Model\Package[]
+     * @var RetailCrm\DeliveryModuleBundle\Model\Package[]
      *
      * @Serializer\Groups({"request", "calculate"})
      * @Serializer\SerializedName("packages")
diff --git a/Model/Request/RequestDelete.php b/Model/Request/RequestDelete.php
index 69f8031..ffe928a 100644
--- a/Model/Request/RequestDelete.php
+++ b/Model/Request/RequestDelete.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Request;
 
 use JMS\Serializer\Annotation as Serializer;
 
diff --git a/Model/Request/RequestPrint.php b/Model/Request/RequestPrint.php
index cbfb89f..4e71d5d 100644
--- a/Model/Request/RequestPrint.php
+++ b/Model/Request/RequestPrint.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Request;
 
 use JMS\Serializer\Annotation as Serializer;
 
diff --git a/Model/Request/RequestSave.php b/Model/Request/RequestSave.php
index 0d5a590..9336ea2 100644
--- a/Model/Request/RequestSave.php
+++ b/Model/Request/RequestSave.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Request;
 
-use Symfony\Component\Validator\Mapping\ClassMetadata;
-use Symfony\Component\Validator\Constraints as Assert;
+use RetailCrm\DeliveryModuleBundle\Model\Customer;
 use JMS\Serializer\Annotation as Serializer;
+use RetailCrm\DeliveryModuleBundle\Model\Manager;
 
 class RequestSave
 {
diff --git a/Model/Request/RequestShipmentDelete.php b/Model/Request/RequestShipmentDelete.php
index 95392bd..eb70024 100644
--- a/Model/Request/RequestShipmentDelete.php
+++ b/Model/Request/RequestShipmentDelete.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Request;
 
 use JMS\Serializer\Annotation as Serializer;
 
diff --git a/Model/Request/RequestShipmentSave.php b/Model/Request/RequestShipmentSave.php
index bed4c76..5b2b9b5 100644
--- a/Model/Request/RequestShipmentSave.php
+++ b/Model/Request/RequestShipmentSave.php
@@ -1,12 +1,13 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Request;
 
 use JMS\Serializer\Annotation as Serializer;
+use RetailCrm\DeliveryModuleBundle\Model\Traits\ExtraDataTrait;
 
 class RequestShipmentSave
 {
-    use Traits\ExtraDataTrait;
+    use ExtraDataTrait;
 
     /**
      * Идентификатор отгрузки в службе доставки. Передается если требуется отредактировать уже оформленную отгрузку
diff --git a/Model/Request/RequestStatusUpdateItem.php b/Model/Request/RequestStatusUpdateItem.php
index 350a018..21c8cbb 100644
--- a/Model/Request/RequestStatusUpdateItem.php
+++ b/Model/Request/RequestStatusUpdateItem.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Request;
 
 use JMS\Serializer\Annotation as Serializer;
+use RetailCrm\DeliveryModuleBundle\Model\StatusInfo;
 
 class RequestStatusUpdateItem
 {
diff --git a/Model/Response/ResponseAutocompleteItem.php b/Model/Response/ResponseAutocompleteItem.php
index 6aac639..8a5186a 100644
--- a/Model/Response/ResponseAutocompleteItem.php
+++ b/Model/Response/ResponseAutocompleteItem.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Response;
 
 use JMS\Serializer\Annotation as Serializer;
 
diff --git a/Model/Response/ResponseAutocompleteSuccessful.php b/Model/Response/ResponseAutocompleteSuccessful.php
index b8c3e17..62b92bd 100644
--- a/Model/Response/ResponseAutocompleteSuccessful.php
+++ b/Model/Response/ResponseAutocompleteSuccessful.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Response;
 
 use JMS\Serializer\Annotation as Serializer;
 
diff --git a/Model/Response/ResponseCalculate.php b/Model/Response/ResponseCalculate.php
index c847adc..a3317a1 100644
--- a/Model/Response/ResponseCalculate.php
+++ b/Model/Response/ResponseCalculate.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Response;
 
 use JMS\Serializer\Annotation as Serializer;
+use RetailCrm\DeliveryModuleBundle\Model\Terminal;
 
 class ResponseCalculate
 {
diff --git a/Model/Response/ResponseCalculateSuccessful.php b/Model/Response/ResponseCalculateSuccessful.php
index d87206b..6d84ad2 100644
--- a/Model/Response/ResponseCalculateSuccessful.php
+++ b/Model/Response/ResponseCalculateSuccessful.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Response;
 
 use JMS\Serializer\Annotation as Serializer;
 
diff --git a/Model/Response/ResponseLoadDeliveryData.php b/Model/Response/ResponseLoadDeliveryData.php
index ccca5f1..ca93b91 100644
--- a/Model/Response/ResponseLoadDeliveryData.php
+++ b/Model/Response/ResponseLoadDeliveryData.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Response;
 
-use Symfony\Component\Validator\Mapping\ClassMetadata;
-use Symfony\Component\Validator\Constraints as Assert;
+use RetailCrm\DeliveryModuleBundle\Model\DeliveryAddress;
+use RetailCrm\DeliveryModuleBundle\Model\StatusInfo;
 use JMS\Serializer\Annotation as Serializer;
 
 class ResponseLoadDeliveryData
diff --git a/Model/Response/ResponseResult.php b/Model/Response/ResponseResult.php
index bb0f2c3..08b4a78 100644
--- a/Model/Response/ResponseResult.php
+++ b/Model/Response/ResponseResult.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Response;
 
 class ResponseResult
 {
diff --git a/Model/Response/ResponseSave.php b/Model/Response/ResponseSave.php
index c0777b3..801f999 100644
--- a/Model/Response/ResponseSave.php
+++ b/Model/Response/ResponseSave.php
@@ -1,13 +1,9 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Response;
 
-use Symfony\Component\Validator\Mapping\ClassMetadata;
-use Symfony\Component\Validator\Constraints as Assert;
 use JMS\Serializer\Annotation as Serializer;
 
-use Intaro\CRMDeliveryBundle\Delivery\Generic\Generic;
-
 class ResponseSave
 {
     /**
diff --git a/Model/Response/ResponseShipmentSave.php b/Model/Response/ResponseShipmentSave.php
index 337c0c8..0ca2090 100644
--- a/Model/Response/ResponseShipmentSave.php
+++ b/Model/Response/ResponseShipmentSave.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Response;
 
 use JMS\Serializer\Annotation as Serializer;
 use Symfony\Component\Validator\Constraints as Assert;
diff --git a/Model/Response/ResponseSuccessful.php b/Model/Response/ResponseSuccessful.php
index 9d86cbf..a55018d 100644
--- a/Model/Response/ResponseSuccessful.php
+++ b/Model/Response/ResponseSuccessful.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RetailCrm\DeliveryModuleBundle\Model;
+namespace RetailCrm\DeliveryModuleBundle\Model\Response;
 
 use JMS\Serializer\Annotation as Serializer;