refactoring

repo/src/main/java/com/cdek/integration/remeasure/commons/Constants.java → repo/src/main/java/com/cdek/integration/remeasure/Constants.java

-package com.cdek.integration.remeasure.commons;
+package com.cdek.integration.remeasure;
 
 /**
  * Константы

repo/src/main/java/com/cdek/integration/remeasure/commons/errors/Errors.java → repo/src/main/java/com/cdek/integration/remeasure/Errors.java

-package com.cdek.integration.remeasure.commons.errors;
+package com.cdek.integration.remeasure;
 
 /**
  * Список ошибок

repo/src/main/java/com/cdek/integration/remeasure/api/order/get/OrderAPI.java → repo/src/main/java/com/cdek/integration/remeasure/api/order/OrderAPI.java

-package com.cdek.integration.remeasure.api.order.get;
+package com.cdek.integration.remeasure.api.order;
 
 import com.cdek.lib.js.order.JSOrder;
 

repo/src/main/java/com/cdek/integration/remeasure/api/order/get/OrderSyncAPI.java → repo/src/main/java/com/cdek/integration/remeasure/api/order/OrderSyncAPI.java

-package com.cdek.integration.remeasure.api.order.get;
+package com.cdek.integration.remeasure.api.order;
 
 import com.cdek.lib.js.concrete.JSOrderSync;
 

repo/src/main/java/com/cdek/integration/remeasure/api/order/update/OrderUpdateAPI.java → repo/src/main/java/com/cdek/integration/remeasure/api/order/OrderUpdateAPI.java

-package com.cdek.integration.remeasure.api.order.update;
+package com.cdek.integration.remeasure.api.order;
 
 import com.cdek.integration.remeasure.commons.http.ApiCallResult;
 import com.cdek.lib.jsapi.JSApiOrderRequest;
-import com.cdek.integration.remeasure.api.order.update.impl.dto.JSApiOrderResponseUpdate1;
+import com.cdek.integration.remeasure.api.order.impl.dto.JSApiOrderResponseUpdate1;
 import com.cdek.integration.remeasure.commons.exceptions.ApiException;
 
 /**

repo/src/main/java/com/cdek/integration/remeasure/api/order/get/impl/OrderAPIImpl.java → repo/src/main/java/com/cdek/integration/remeasure/api/order/impl/OrderAPIImpl.java

-package com.cdek.integration.remeasure.api.order.get.impl;
+package com.cdek.integration.remeasure.api.order.impl;
 
 import com.cdek.commons.js.JSUser;
 import com.cdek.lib.js.order.JSOrder;
-import com.cdek.integration.remeasure.api.order.get.OrderAPI;
+import com.cdek.integration.remeasure.api.order.OrderAPI;
 import org.hc.jp.utils.HttpClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

repo/src/main/java/com/cdek/integration/remeasure/api/order/get/impl/OrderSyncAPIImpl.java → repo/src/main/java/com/cdek/integration/remeasure/api/order/impl/OrderSyncAPIImpl.java

-package com.cdek.integration.remeasure.api.order.get.impl;
+package com.cdek.integration.remeasure.api.order.impl;
 
+import com.cdek.integration.remeasure.api.order.impl.dto.ItemsTO;
 import com.cdek.lib.js.concrete.JSOrderSync;
 import com.cdek.lib.js.concrete.JSOrderSyncRequest;
-import com.cdek.integration.remeasure.api.order.get.OrderSyncAPI;
+import com.cdek.integration.remeasure.api.order.OrderSyncAPI;
 import org.hc.jp.utils.HttpClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

repo/src/main/java/com/cdek/integration/remeasure/api/order/update/impl/OrderUpdateAPIImpl.java → repo/src/main/java/com/cdek/integration/remeasure/api/order/impl/OrderUpdateAPIImpl.java

-package com.cdek.integration.remeasure.api.order.update.impl;
+package com.cdek.integration.remeasure.api.order.impl;
 
 import com.cdek.integration.remeasure.api.integration.status.response.StatusResponse;
-import com.cdek.integration.remeasure.api.order.update.OrderUpdateAPI;
-import com.cdek.integration.remeasure.api.order.update.impl.dto.JSApiOrderResponseUpdate1;
+import com.cdek.integration.remeasure.api.order.OrderUpdateAPI;
+import com.cdek.integration.remeasure.api.order.impl.dto.JSApiOrderResponseUpdate1;
 import com.cdek.integration.remeasure.commons.http.ApiCallResult;
 import com.cdek.integration.remeasure.commons.utils.JsonUtils;
 import com.cdek.lib.jsapi.JSApiOrderRequest;

repo/src/main/java/com/cdek/integration/remeasure/api/order/get/impl/ItemsTO.java → repo/src/main/java/com/cdek/integration/remeasure/api/order/impl/dto/ItemsTO.java

-package com.cdek.integration.remeasure.api.order.get.impl;
+package com.cdek.integration.remeasure.api.order.impl.dto;
 
 import com.cdek.lib.js.concrete.JSOrderSync;
 

repo/src/main/java/com/cdek/integration/remeasure/api/order/update/impl/dto/JSApiOrderResponseUpdate1.java → repo/src/main/java/com/cdek/integration/remeasure/api/order/impl/dto/JSApiOrderResponseUpdate1.java

-package com.cdek.integration.remeasure.api.order.update.impl.dto;
+package com.cdek.integration.remeasure.api.order.impl.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;

repo/src/main/java/com/cdek/integration/remeasure/api/order/update/impl/dto/JSApiOrderResultStr.java → repo/src/main/java/com/cdek/integration/remeasure/api/order/impl/dto/JSApiOrderResultStr.java

-package com.cdek.integration.remeasure.api.order.update.impl.dto;
+package com.cdek.integration.remeasure.api.order.impl.dto;
 
 import com.cdek.lib.jsapi.JSApiErrorMessage;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

repo/src/main/java/com/cdek/integration/remeasure/commons/adapters/JsonLocalDateDeserializer.java

 package com.cdek.integration.remeasure.commons.adapters;
 
-import com.cdek.integration.remeasure.commons.Constants;
+import com.cdek.integration.remeasure.Constants;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.ObjectCodec;
 import com.fasterxml.jackson.databind.DeserializationContext;

repo/src/main/java/com/cdek/integration/remeasure/commons/adapters/XmlLocalDateAdapter.java

 package com.cdek.integration.remeasure.commons.adapters;
 
-import com.cdek.integration.remeasure.commons.Constants;
+import com.cdek.integration.remeasure.Constants;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;

repo/src/main/java/com/cdek/integration/remeasure/commons/adapters/XmlUTCDateAdapter.java

@@ -5,7 +5,7 @@
  */
 package com.cdek.integration.remeasure.commons.adapters;
 
-import com.cdek.integration.remeasure.commons.Constants;
+import com.cdek.integration.remeasure.Constants;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;

repo/src/main/java/com/cdek/integration/remeasure/commons/exceptions/RequestProcessingException.java

 package com.cdek.integration.remeasure.commons.exceptions;
 
-import com.cdek.integration.remeasure.api.remeasure.response.RemeasureResponseOrder;
+import com.cdek.integration.remeasure.model.remeasure.response.RemeasureResponseOrder;
 
 import java.util.Collections;
 import java.util.List;

repo/src/main/java/com/cdek/integration/remeasure/controllers/RemeasureController.java

 package com.cdek.integration.remeasure.controllers;
 
 import com.cdek.commons.utils.JSONUtil;
-import com.cdek.integration.remeasure.api.remeasure.response.RemeasureResponse;
+import com.cdek.integration.remeasure.model.remeasure.response.RemeasureResponse;
 import com.cdek.integration.remeasure.commons.utils.JsonUtils;
-import com.cdek.integration.remeasure.api.remeasure.request.dto.RemeasureRequestDto;
+import com.cdek.integration.remeasure.model.remeasure.request.dto.RemeasureRequestDto;
 import com.cdek.integration.remeasure.services.requestprocessing.RequestProcessingService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

repo/src/main/java/com/cdek/integration/remeasure/dao/InnerErrorDAO.java

 package com.cdek.integration.remeasure.dao;
 
-import com.cdek.integration.remeasure.model.dao.InnerError;
+import com.cdek.integration.remeasure.model.persisted.InnerError;
 
 /**
  * ДАО для работы с ошибками

repo/src/main/java/com/cdek/integration/remeasure/dao/ParametersDAO.java

 package com.cdek.integration.remeasure.dao;
 
-import com.cdek.integration.remeasure.model.dao.Parameter;
+import com.cdek.integration.remeasure.model.persisted.Parameter;
 
 /**
  * DAO для хранения внутренних настроек

repo/src/main/java/com/cdek/integration/remeasure/dao/impl/InnerErrorDAOImpl.java

@@ -2,7 +2,7 @@ package com.cdek.integration.remeasure.dao.impl;
 
 import com.cdek.integration.remeasure.dao.InnerErrorDAO;
 import com.cdek.integration.remeasure.dao.mapper.InnerErrorMapper;
-import com.cdek.integration.remeasure.model.dao.InnerError;
+import com.cdek.integration.remeasure.model.persisted.InnerError;
 
 /**
  * Имплементация {@link InnerErrorDAOImpl}

repo/src/main/java/com/cdek/integration/remeasure/dao/impl/ParametersDAOImpl.java

@@ -2,7 +2,7 @@ package com.cdek.integration.remeasure.dao.impl;
 
 
 import com.cdek.integration.remeasure.dao.ParametersDAO;
-import com.cdek.integration.remeasure.model.dao.Parameter;
+import com.cdek.integration.remeasure.model.persisted.Parameter;
 import com.cdek.integration.remeasure.dao.mapper.ParametersMapper;
 import org.springframework.util.Assert;