shopizer-developers

diff --git a/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties b/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
index 9a52b55..1887539 100644
--- a/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
+++ b/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Mon Oct 31 09:23:12 EDT 2016
+#Mon Oct 31 09:31:59 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-canadapost

diff --git a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
index 7e25819..1532148 100644
--- a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
+++ b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Mon Oct 31 09:23:16 EDT 2016
+#Mon Oct 31 09:31:58 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-shipping-distance-processor

diff --git a/sm-core/target/classes/META-INF/maven/com.shopizer/sm-core/pom.properties b/sm-core/target/classes/META-INF/maven/com.shopizer/sm-core/pom.properties
index 186292b..fa6b405 100644
--- a/sm-core/target/classes/META-INF/maven/com.shopizer/sm-core/pom.properties
+++ b/sm-core/target/classes/META-INF/maven/com.shopizer/sm-core/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Mon Oct 31 09:23:21 EDT 2016
+#Mon Oct 31 09:31:56 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-core

diff --git a/sm-core-modules/target/classes/META-INF/maven/com.shopizer/sm-core-modules/pom.properties b/sm-core-modules/target/classes/META-INF/maven/com.shopizer/sm-core-modules/pom.properties
index 73eb72d..2bc7d14 100644
--- a/sm-core-modules/target/classes/META-INF/maven/com.shopizer/sm-core-modules/pom.properties
+++ b/sm-core-modules/target/classes/META-INF/maven/com.shopizer/sm-core-modules/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Mon Oct 31 09:23:27 EDT 2016
+#Mon Oct 31 09:31:57 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-core-modules

diff --git a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
index 0014196..e4522cd 100644
--- a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
+++ b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Mon Oct 31 09:23:32 EDT 2016
+#Mon Oct 31 09:32:00 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-search

diff --git a/sm-shop/pom.xml b/sm-shop/pom.xml
index 201e266..fa1b315 100644
--- a/sm-shop/pom.xml
+++ b/sm-shop/pom.xml
@@ -106,7 +106,29 @@
 		</dependency>
 
 	
-
+		<!-- Servlet -->
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.5</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet.jsp</groupId>
+			<artifactId>jsp-api</artifactId>
+			<version>2.1</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet.jsp.jstl</groupId>
+			<artifactId>jstl-api</artifactId>
+			<version>1.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.web</groupId>
+			<artifactId>jstl-impl</artifactId>
+			<version>1.2</version>
+		</dependency>
 		
 
 		

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.java
index f0be15b..587b400 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.java
@@ -5,7 +5,7 @@ package com.salesmanager.shop.populator.customer;
 
 import org.apache.commons.lang.StringUtils;
 
-<<<<<<< HEAD
+
 import com.salesmanager.core.business.exception.ConversionException;
 import com.salesmanager.core.business.utils.AbstractDataPopulator;
 import com.salesmanager.core.model.customer.Customer;
@@ -13,14 +13,8 @@ import com.salesmanager.core.model.merchant.MerchantStore;
 import com.salesmanager.core.model.reference.language.Language;
 import com.salesmanager.shop.model.customer.Address;
 
-=======
-import com.salesmanager.core.model.customer.Customer;
-import com.salesmanager.core.business.exception.ConversionException;
-import com.salesmanager.core.model.merchant.MerchantStore;
-import com.salesmanager.core.model.reference.language.Language;
-import com.salesmanager.core.business.utils.AbstractDataPopulator;
-import com.salesmanager.shop.model.customer.Address;
->>>>>>> 9e4a0d45714b1916a82f1c684b357c0a4ed2e78f
+
+
 
 /**
  * @author Admin

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.java
index 3618c15..c9b695b 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.java
@@ -5,7 +5,7 @@ package com.salesmanager.shop.populator.customer;
 
 import org.apache.commons.lang.StringUtils;
 
-<<<<<<< HEAD
+
 import com.salesmanager.core.business.exception.ConversionException;
 import com.salesmanager.core.business.utils.AbstractDataPopulator;
 import com.salesmanager.core.model.customer.Customer;
@@ -14,15 +14,7 @@ import com.salesmanager.core.model.reference.language.Language;
 import com.salesmanager.shop.model.customer.Address;
 import com.salesmanager.shop.model.customer.CustomerEntity;
 
-=======
-import com.salesmanager.core.model.customer.Customer;
-import com.salesmanager.core.business.exception.ConversionException;
-import com.salesmanager.core.model.merchant.MerchantStore;
-import com.salesmanager.core.model.reference.language.Language;
-import com.salesmanager.core.business.utils.AbstractDataPopulator;
-import com.salesmanager.shop.model.customer.Address;
-import com.salesmanager.shop.model.customer.CustomerEntity;
->>>>>>> 9e4a0d45714b1916a82f1c684b357c0a4ed2e78f
+
 
 /**
  * <p>

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.java
index 05cdcc8..87cda5f 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.java
@@ -1,6 +1,5 @@
 package com.salesmanager.shop.populator.customer;
-<<<<<<< HEAD
-=======
+
 
 import com.salesmanager.core.business.exception.ConversionException;
 import com.salesmanager.core.business.utils.AbstractDataPopulator;
@@ -9,19 +8,11 @@ import com.salesmanager.core.model.merchant.MerchantStore;
 import com.salesmanager.core.model.reference.language.Language;
 import com.salesmanager.shop.admin.model.customer.attribute.CustomerOption;
 import com.salesmanager.shop.admin.model.customer.attribute.CustomerOptionValue;
->>>>>>> 9e4a0d45714b1916a82f1c684b357c0a4ed2e78f
+
 
 import java.util.ArrayList;
 import java.util.List;
 
-<<<<<<< HEAD
-import com.salesmanager.core.business.exception.ConversionException;
-import com.salesmanager.core.business.utils.AbstractDataPopulator;
-import com.salesmanager.core.model.customer.attribute.CustomerOptionSet;
-import com.salesmanager.core.model.merchant.MerchantStore;
-import com.salesmanager.core.model.reference.language.Language;
-import com.salesmanager.shop.admin.model.customer.attribute.CustomerOption;
-import com.salesmanager.shop.admin.model.customer.attribute.CustomerOptionValue;
 
 
 /**
@@ -29,8 +20,7 @@ import com.salesmanager.shop.admin.model.customer.attribute.CustomerOptionValue;
  * @author c.samson
  *
  */
-=======
->>>>>>> 9e4a0d45714b1916a82f1c684b357c0a4ed2e78f
+
 public class CustomerOptionPopulator extends
 		AbstractDataPopulator<com.salesmanager.core.model.customer.attribute.CustomerOption, com.salesmanager.shop.admin.model.customer.attribute.CustomerOption> {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerPopulator.java
index 28e0e12..38047a3 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerPopulator.java
@@ -1,9 +1,7 @@
 package com.salesmanager.shop.populator.customer;
-<<<<<<< HEAD
+
 
 import java.util.Map;
-=======
->>>>>>> 9e4a0d45714b1916a82f1c684b357c0a4ed2e78f
 
 import com.salesmanager.core.business.exception.ConversionException;
 import com.salesmanager.core.business.services.customer.attribute.CustomerOptionService;
@@ -30,33 +28,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-<<<<<<< HEAD
-import com.salesmanager.core.business.exception.ConversionException;
-import com.salesmanager.core.business.services.customer.attribute.CustomerOptionService;
-import com.salesmanager.core.business.services.customer.attribute.CustomerOptionValueService;
-import com.salesmanager.core.business.services.reference.country.CountryService;
-import com.salesmanager.core.business.services.reference.language.LanguageService;
-import com.salesmanager.core.business.services.reference.zone.ZoneService;
-import com.salesmanager.core.business.utils.AbstractDataPopulator;
-import com.salesmanager.core.model.common.Billing;
-import com.salesmanager.core.model.common.Delivery;
-import com.salesmanager.core.model.customer.Customer;
-import com.salesmanager.core.model.customer.attribute.CustomerAttribute;
-import com.salesmanager.core.model.customer.attribute.CustomerOption;
-import com.salesmanager.core.model.customer.attribute.CustomerOptionValue;
-import com.salesmanager.core.model.merchant.MerchantStore;
-import com.salesmanager.core.model.reference.country.Country;
-import com.salesmanager.core.model.reference.language.Language;
-import com.salesmanager.core.model.reference.zone.Zone;
-import com.salesmanager.shop.model.customer.Address;
-import com.salesmanager.shop.model.customer.PersistableCustomer;
-import com.salesmanager.shop.model.customer.attribute.PersistableCustomerAttribute;
-
-
-=======
-import java.util.Map;
->>>>>>> 9e4a0d45714b1916a82f1c684b357c0a4ed2e78f
-
 public class CustomerPopulator extends
 		AbstractDataPopulator<PersistableCustomer, Customer> {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/store/ReadableMerchantStorePopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/store/ReadableMerchantStorePopulator.java
index d1481de..6de6b9e 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/store/ReadableMerchantStorePopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/store/ReadableMerchantStorePopulator.java
@@ -1,16 +1,17 @@
-package com.salesmanager.web.populator.store;
+package com.salesmanager.shop.populator.store;
 
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.shop.ReadableMerchantStore;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.util.CollectionUtils;
 
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.model.shop.ReadableMerchantStore;
+
 /**
  * Populates MerchantStore core entity model object
  * @author carlsamson

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/LandingController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/LandingController.java
index 011ac00..6bdfb3b 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/LandingController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/LandingController.java
@@ -1,15 +1,15 @@
-package com.salesmanager.web.shop.controller;
+package com.salesmanager.shop.store.controller;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
+import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -17,26 +17,28 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.relationship.ProductRelationship;
-import com.salesmanager.core.business.catalog.product.model.relationship.ProductRelationshipType;
-import com.salesmanager.core.business.catalog.product.service.PricingService;
-import com.salesmanager.core.business.catalog.product.service.relationship.ProductRelationshipService;
-import com.salesmanager.core.business.content.model.Content;
-import com.salesmanager.core.business.content.model.ContentDescription;
-import com.salesmanager.core.business.content.service.ContentService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.merchant.service.MerchantStoreService;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.entity.catalog.product.ReadableProduct;
-import com.salesmanager.web.entity.shop.Breadcrumb;
-import com.salesmanager.web.entity.shop.BreadcrumbItem;
-import com.salesmanager.web.entity.shop.BreadcrumbItemType;
-import com.salesmanager.web.entity.shop.PageInformation;
-import com.salesmanager.web.populator.catalog.ReadableProductPopulator;
-import com.salesmanager.web.utils.ImageFilePath;
-import com.salesmanager.web.utils.LabelUtils;
+import com.salesmanager.core.business.services.catalog.product.PricingService;
+import com.salesmanager.core.business.services.catalog.product.relationship.ProductRelationshipService;
+import com.salesmanager.core.business.services.content.ContentService;
+import com.salesmanager.core.business.services.merchant.MerchantStoreService;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.relationship.ProductRelationship;
+import com.salesmanager.core.model.catalog.product.relationship.ProductRelationshipType;
+import com.salesmanager.core.model.content.Content;
+import com.salesmanager.core.model.content.ContentDescription;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.model.catalog.product.ReadableProduct;
+import com.salesmanager.shop.model.shop.Breadcrumb;
+import com.salesmanager.shop.model.shop.BreadcrumbItem;
+import com.salesmanager.shop.model.shop.BreadcrumbItemType;
+import com.salesmanager.shop.model.shop.PageInformation;
+import com.salesmanager.shop.populator.catalog.ReadableProductPopulator;
+import com.salesmanager.shop.utils.ImageFilePath;
+import com.salesmanager.shop.utils.LabelUtils;
+
+
 
 @Controller
 public class LandingController {

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/tags/ActiveLinkTag.java b/sm-shop/src/main/java/com/salesmanager/shop/tags/ActiveLinkTag.java
index 440ce29..349092a 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/tags/ActiveLinkTag.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/tags/ActiveLinkTag.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.tags;
+package com.salesmanager.shop.tags;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspException;
@@ -8,7 +8,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.salesmanager.web.constants.Constants;
+import com.salesmanager.shop.constants.Constants;
+
 
 public class ActiveLinkTag extends TagSupport {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/tags/AdminProductDownloadUrlTag.java b/sm-shop/src/main/java/com/salesmanager/shop/tags/AdminProductDownloadUrlTag.java
index 334a735..cfdb9e6 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/tags/AdminProductDownloadUrlTag.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/tags/AdminProductDownloadUrlTag.java
@@ -1,23 +1,24 @@
-package com.salesmanager.web.tags;
+package com.salesmanager.shop.tags;
 
 import java.util.Map;
 
+import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.tags.RequestContextAwareTag;
 
-import com.salesmanager.core.business.catalog.product.model.file.DigitalProduct;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.utils.FilePathUtils;
+import com.salesmanager.core.model.catalog.product.file.DigitalProduct;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.utils.FilePathUtils;
+
+
 
 public class AdminProductDownloadUrlTag extends RequestContextAwareTag {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/tags/ConfigurationTag.java b/sm-shop/src/main/java/com/salesmanager/shop/tags/ConfigurationTag.java
index ff7cdf7..37cda2e 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/tags/ConfigurationTag.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/tags/ConfigurationTag.java
@@ -1,16 +1,17 @@
-package com.salesmanager.web.tags;
+package com.salesmanager.shop.tags;
 
+import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.tags.RequestContextAwareTag;
 
-import com.salesmanager.core.utils.CoreConfiguration;
+import com.salesmanager.core.business.utils.CoreConfiguration;
+
 
 public class ConfigurationTag extends RequestContextAwareTag {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/tags/ContentImageUrlTag.java b/sm-shop/src/main/java/com/salesmanager/shop/tags/ContentImageUrlTag.java
index d491a86..db28c46 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/tags/ContentImageUrlTag.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/tags/ContentImageUrlTag.java
@@ -1,20 +1,21 @@
-package com.salesmanager.web.tags;
+package com.salesmanager.shop.tags;
 
+import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.tags.RequestContextAwareTag;
 
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.utils.FilePathUtils;
-import com.salesmanager.web.utils.ImageFilePath;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.utils.FilePathUtils;
+import com.salesmanager.shop.utils.ImageFilePath;
+
 
 public class ContentImageUrlTag extends RequestContextAwareTag {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/tags/ManufacturerImageUrlTag.java b/sm-shop/src/main/java/com/salesmanager/shop/tags/ManufacturerImageUrlTag.java
index 463523b..34a5f53 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/tags/ManufacturerImageUrlTag.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/tags/ManufacturerImageUrlTag.java
@@ -1,21 +1,23 @@
-package com.salesmanager.web.tags;
+package com.salesmanager.shop.tags;
 
+import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.tags.RequestContextAwareTag;
 
-import com.salesmanager.core.business.catalog.product.model.manufacturer.Manufacturer;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.utils.FilePathUtils;
-import com.salesmanager.web.utils.ImageFilePath;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.model.catalog.manufacturer.Manufacturer;
+import com.salesmanager.shop.utils.FilePathUtils;
+import com.salesmanager.shop.utils.ImageFilePath;
+
+
 
 public class ManufacturerImageUrlTag extends RequestContextAwareTag {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/tags/OrderProductDownloadUrlTag.java b/sm-shop/src/main/java/com/salesmanager/shop/tags/OrderProductDownloadUrlTag.java
index 9f752fe..344154b 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/tags/OrderProductDownloadUrlTag.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/tags/OrderProductDownloadUrlTag.java
@@ -1,19 +1,20 @@
-package com.salesmanager.web.tags;
+package com.salesmanager.shop.tags;
 
+import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.tags.RequestContextAwareTag;
 
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.entity.order.ReadableOrderProductDownload;
-import com.salesmanager.web.utils.FilePathUtils;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.model.order.ReadableOrderProductDownload;
+import com.salesmanager.shop.utils.FilePathUtils;
+
 
 public class OrderProductDownloadUrlTag extends RequestContextAwareTag {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/tags/PageContentTag.java b/sm-shop/src/main/java/com/salesmanager/shop/tags/PageContentTag.java
index 4b24694..edc77ac 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/tags/PageContentTag.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/tags/PageContentTag.java
@@ -1,20 +1,21 @@
-package com.salesmanager.web.tags;
+package com.salesmanager.shop.tags;
 
+import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.tags.RequestContextAwareTag;
 
-import com.salesmanager.core.business.content.model.Content;
-import com.salesmanager.core.business.content.model.ContentDescription;
-import com.salesmanager.core.business.content.service.ContentService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.web.constants.Constants;
+import com.salesmanager.core.business.services.content.ContentService;
+import com.salesmanager.core.model.content.Content;
+import com.salesmanager.core.model.content.ContentDescription;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.constants.Constants;
+
 
 public class PageContentTag extends RequestContextAwareTag  {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/tags/ProductDescriptionUrlTag.java b/sm-shop/src/main/java/com/salesmanager/shop/tags/ProductDescriptionUrlTag.java
index 4367537..372f869 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/tags/ProductDescriptionUrlTag.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/tags/ProductDescriptionUrlTag.java
@@ -1,20 +1,21 @@
-package com.salesmanager.web.tags;
+package com.salesmanager.shop.tags;
 
+import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspException;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.tags.RequestContextAwareTag;
 
-import com.salesmanager.core.business.catalog.product.model.description.ProductDescription;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.utils.FilePathUtils;
+import com.salesmanager.core.model.catalog.product.description.ProductDescription;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.utils.FilePathUtils;
+
 
 public class ProductDescriptionUrlTag extends RequestContextAwareTag {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/tags/ProductImageUrlTag.java b/sm-shop/src/main/java/com/salesmanager/shop/tags/ProductImageUrlTag.java
index 7281c40..5417253 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/tags/ProductImageUrlTag.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/tags/ProductImageUrlTag.java
@@ -1,21 +1,21 @@
-package com.salesmanager.web.tags;
+package com.salesmanager.shop.tags;
 
+import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.tags.RequestContextAwareTag;
 
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.utils.FilePathUtils;
-import com.salesmanager.web.utils.ImageFilePath;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.utils.FilePathUtils;
+import com.salesmanager.shop.utils.ImageFilePath;
 
 public class ProductImageUrlTag extends RequestContextAwareTag {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/tags/ShopProductImageUrlTag.java b/sm-shop/src/main/java/com/salesmanager/shop/tags/ShopProductImageUrlTag.java
index c57e728..d07dbff 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/tags/ShopProductImageUrlTag.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/tags/ShopProductImageUrlTag.java
@@ -1,21 +1,22 @@
-package com.salesmanager.web.tags;
+package com.salesmanager.shop.tags;
 
+import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspException;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.tags.RequestContextAwareTag;
 
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.utils.FilePathUtils;
-import com.salesmanager.web.utils.ImageFilePath;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.utils.FilePathUtils;
+import com.salesmanager.shop.utils.ImageFilePath;
+
 
 
 public class ShopProductImageUrlTag extends RequestContextAwareTag {

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/tags/ShopProductPriceFormatTag.java b/sm-shop/src/main/java/com/salesmanager/shop/tags/ShopProductPriceFormatTag.java
index 7b578e1..e9a7bf1 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/tags/ShopProductPriceFormatTag.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/tags/ShopProductPriceFormatTag.java
@@ -1,21 +1,22 @@
-package com.salesmanager.web.tags;
+package com.salesmanager.shop.tags;
 
 import java.math.BigDecimal;
 
+import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.tags.RequestContextAwareTag;
 
-import com.salesmanager.core.business.catalog.product.service.PricingService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.currency.model.Currency;
-import com.salesmanager.core.utils.ProductPriceUtils;
-import com.salesmanager.web.constants.Constants;
+import com.salesmanager.core.business.services.catalog.product.PricingService;
+import com.salesmanager.core.business.utils.ProductPriceUtils;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.currency.Currency;
+import com.salesmanager.shop.constants.Constants;
+
 
 public class ShopProductPriceFormatTag extends RequestContextAwareTag  {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/tags/ShopProductRelationshipTag.java b/sm-shop/src/main/java/com/salesmanager/shop/tags/ShopProductRelationshipTag.java
index 163d48e..2310f79 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/tags/ShopProductRelationshipTag.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/tags/ShopProductRelationshipTag.java
@@ -1,29 +1,31 @@
-package com.salesmanager.web.tags;
+package com.salesmanager.shop.tags;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.tags.RequestContextAwareTag;
 
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.relationship.ProductRelationship;
-import com.salesmanager.core.business.catalog.product.service.PricingService;
-import com.salesmanager.core.business.catalog.product.service.relationship.ProductRelationshipService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.CacheUtils;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.entity.catalog.product.ReadableProduct;
-import com.salesmanager.web.populator.catalog.ReadableProductPopulator;
-import com.salesmanager.web.utils.ImageFilePath;
+import com.salesmanager.core.business.services.catalog.product.PricingService;
+import com.salesmanager.core.business.services.catalog.product.relationship.ProductRelationshipService;
+import com.salesmanager.core.business.utils.CacheUtils;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.relationship.ProductRelationship;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.model.catalog.product.ReadableProduct;
+import com.salesmanager.shop.populator.catalog.ReadableProductPopulator;
+import com.salesmanager.shop.utils.ImageFilePath;
+
+
 
 public class ShopProductRelationshipTag extends RequestContextAwareTag  {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/tags/StoreBreadcrumbsTag.java b/sm-shop/src/main/java/com/salesmanager/shop/tags/StoreBreadcrumbsTag.java
index 80e89c9..d8dd51e 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/tags/StoreBreadcrumbsTag.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/tags/StoreBreadcrumbsTag.java
@@ -1,5 +1,6 @@
-package com.salesmanager.web.tags;
+package com.salesmanager.shop.tags;
 
+import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -11,10 +12,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.entity.shop.Breadcrumb;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.model.shop.Breadcrumb;
 
-import edu.emory.mathcs.backport.java.util.Arrays;
 
 public class StoreBreadcrumbsTag extends TagSupport {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/tags/StoreFooterlTag.java b/sm-shop/src/main/java/com/salesmanager/shop/tags/StoreFooterlTag.java
index 424ca3f..e30f061 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/tags/StoreFooterlTag.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/tags/StoreFooterlTag.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.tags;
+package com.salesmanager.shop.tags;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -10,8 +10,8 @@ import javax.servlet.jsp.tagext.TagSupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.web.constants.Constants;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.shop.constants.Constants;
 
 public class StoreFooterlTag extends TagSupport {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/tags/StoreLogoUrlTag.java b/sm-shop/src/main/java/com/salesmanager/shop/tags/StoreLogoUrlTag.java
index e004f3a..e226b1c 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/tags/StoreLogoUrlTag.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/tags/StoreLogoUrlTag.java
@@ -1,21 +1,21 @@
-package com.salesmanager.web.tags;
+package com.salesmanager.shop.tags;
 
+import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspException;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.tags.RequestContextAwareTag;
 
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.utils.FilePathUtils;
-import com.salesmanager.web.utils.ImageFilePath;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.utils.FilePathUtils;
+import com.salesmanager.shop.utils.ImageFilePath;
 
 public class StoreLogoUrlTag extends RequestContextAwareTag {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/AdminAccessDeniedHandler.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/AdminAccessDeniedHandler.java
index 784211e..96cfc59 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/AdminAccessDeniedHandler.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/AdminAccessDeniedHandler.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.utils;
+package com.salesmanager.shop.utils;
 
 import java.io.IOException;
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/BeanUtils.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/BeanUtils.java
index 63bf8c1..1146dfb 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/BeanUtils.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/BeanUtils.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.utils;
+package com.salesmanager.shop.utils;
 
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/BreadcrumbsUtils.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/BreadcrumbsUtils.java
index be6c87a..577435f 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/BreadcrumbsUtils.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/BreadcrumbsUtils.java
@@ -1,26 +1,27 @@
-package com.salesmanager.web.utils;
+package com.salesmanager.shop.utils;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
+import javax.inject.Inject;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.salesmanager.core.business.catalog.category.model.Category;
-import com.salesmanager.core.business.catalog.category.service.CategoryService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.entity.catalog.category.ReadableCategory;
-import com.salesmanager.web.entity.catalog.product.ReadableProduct;
-import com.salesmanager.web.entity.shop.Breadcrumb;
-import com.salesmanager.web.entity.shop.BreadcrumbItem;
-import com.salesmanager.web.entity.shop.BreadcrumbItemType;
-
-import edu.emory.mathcs.backport.java.util.Arrays;
+import com.salesmanager.core.business.services.catalog.category.CategoryService;
+import com.salesmanager.core.model.catalog.category.Category;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.model.catalog.category.ReadableCategory;
+import com.salesmanager.shop.model.catalog.product.ReadableProduct;
+import com.salesmanager.shop.model.shop.Breadcrumb;
+import com.salesmanager.shop.model.shop.BreadcrumbItem;
+import com.salesmanager.shop.model.shop.BreadcrumbItemType;
+
 
 @Component
 public class BreadcrumbsUtils {

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/FieldMatchValidator.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/FieldMatchValidator.java
index 8c602fb..9a4d74d 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/FieldMatchValidator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/FieldMatchValidator.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.utils;
+package com.salesmanager.shop.utils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/LocalImageFilePathUtils.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/LocalImageFilePathUtils.java
index 0daee59..f5d1c61 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/LocalImageFilePathUtils.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/LocalImageFilePathUtils.java
@@ -1,12 +1,14 @@
-package com.salesmanager.web.utils;
+package com.salesmanager.shop.utils;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.manufacturer.Manufacturer;
-import com.salesmanager.core.business.content.model.FileContentType;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.web.constants.Constants;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.content.FileContentType;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.model.catalog.manufacturer.Manufacturer;
+
+
 
 
 public class LocalImageFilePathUtils extends AbstractimageFilePath{

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/MerchantUtils.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/MerchantUtils.java
index 2370287..6a66803 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/MerchantUtils.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/MerchantUtils.java
@@ -1,10 +1,10 @@
-package com.salesmanager.web.utils;
+package com.salesmanager.shop.utils;
 
 import java.util.Date;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.model.merchant.MerchantStore;
 
 public class MerchantUtils {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/PageBuilderUtils.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/PageBuilderUtils.java
index dc7feb0..7c48144 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/PageBuilderUtils.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/PageBuilderUtils.java
@@ -1,7 +1,7 @@
-package com.salesmanager.web.utils;
+package com.salesmanager.shop.utils;
 
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.web.shop.controller.ControllerConstants;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.shop.store.controller.ControllerConstants;
 
 public class PageBuilderUtils {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/TokenizeTool.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/TokenizeTool.java
index b6b157d..5a452e6 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/TokenizeTool.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/TokenizeTool.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.utils;
+package com.salesmanager.shop.utils;
 
 import javax.crypto.Cipher;
 import javax.crypto.KeyGenerator;

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.class
index 3d43a94..e812413 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.class
index b909b93..603320f 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.class
index 46a8696..f3be656 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerPopulator.class
index 0632da3..3b97392 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerPopulator.class differ

diff --git a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
index fdd8705..3e1dc72 100644
--- a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
+++ b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Mon Oct 31 09:23:38 EDT 2016
+#Mon Oct 31 09:34:29 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-shop