shopizer-developers

diff --git a/shopizer-canadapost/.classpath b/shopizer-canadapost/.classpath
index 62d4b8e..cd61a83 100644
--- a/shopizer-canadapost/.classpath
+++ b/shopizer-canadapost/.classpath
@@ -28,7 +28,7 @@
 			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_91">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

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 9473de1..35e285d 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
-#Thu Oct 27 12:29:25 EDT 2016
+#Fri Oct 28 08:24:27 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-canadapost

diff --git a/shopizer-shipping-distance-module/.classpath b/shopizer-shipping-distance-module/.classpath
index 62d4b8e..cd61a83 100644
--- a/shopizer-shipping-distance-module/.classpath
+++ b/shopizer-shipping-distance-module/.classpath
@@ -28,7 +28,7 @@
 			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_91">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/shopizer-shipping-distance-module/target/classes/.gitignore b/shopizer-shipping-distance-module/target/classes/.gitignore
new file mode 100644
index 0000000..3385916
--- /dev/null
+++ b/shopizer-shipping-distance-module/target/classes/.gitignore
@@ -0,0 +1 @@
+/META-INF/

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 e7342de..fa7e0fd 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
-#Thu Oct 27 12:29:23 EDT 2016
+#Fri Oct 28 08:24:27 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-shipping-distance-processor

diff --git a/sm-core/.classpath b/sm-core/.classpath
index fc5f96c..5cad398 100644
--- a/sm-core/.classpath
+++ b/sm-core/.classpath
@@ -27,7 +27,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_91">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

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 d94678f..487dd61 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
-#Thu Oct 27 12:29:17 EDT 2016
+#Fri Oct 28 08:24:23 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-core

diff --git a/sm-core-model/.classpath b/sm-core-model/.classpath
index 6cd5836..ba13a8b 100644
--- a/sm-core-model/.classpath
+++ b/sm-core-model/.classpath
@@ -17,7 +17,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_91">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/sm-core-model/target/.gitignore b/sm-core-model/target/.gitignore
new file mode 100644
index 0000000..4569837
--- /dev/null
+++ b/sm-core-model/target/.gitignore
@@ -0,0 +1,2 @@
+/classes/
+/test-classes/

diff --git a/sm-core-model/target/classes/META-INF/maven/com.shopizer/sm-core-model/pom.properties b/sm-core-model/target/classes/META-INF/maven/com.shopizer/sm-core-model/pom.properties
index d4cea0b..1ea41c5 100644
--- a/sm-core-model/target/classes/META-INF/maven/com.shopizer/sm-core-model/pom.properties
+++ b/sm-core-model/target/classes/META-INF/maven/com.shopizer/sm-core-model/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Thu Oct 27 12:29:22 EDT 2016
+#Fri Oct 28 08:24:23 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-core-model

diff --git a/sm-core-model/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/sm-core-model/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/sm-core-model/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

diff --git a/sm-core-model/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/sm-core-model/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
new file mode 100644
index 0000000..33fc070
--- /dev/null
+++ b/sm-core-model/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1,152 @@
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\type\ProductType.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\common\Description.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\content\ImageContentFile.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\order\OrderTotalType.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\reference\language\Language.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\order\orderproduct\OrderProductDownload.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\attribute\AttributeCriteria.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\search\SearchKeywords.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\order\payment\CreditCard.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\availability\ProductAvailability.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\payments\Transaction.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\user\User.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\payments\PaymentType.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\common\EntityList.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\system\CustomIntegrationConfiguration.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\category\CategoryDescription.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\order\OrderTotal.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\content\StaticContentFile.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\shipping\ShippingType.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\order\OrderTotalSummary.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\search\SearchFacet.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\content\ContentFile.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\content\FileContentType.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\shoppingcart\ShoppingCartAttributeItem.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\file\DigitalProduct.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\relationship\ProductRelationshipType.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\system\MerchantConfig.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\Product.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\order\orderproduct\OrderProductAttribute.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\content\InputContentFile.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\customer\Customer.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\customer\CustomerList.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\reference\zone\Zone.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\customer\attribute\CustomerOptionSet.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\customer\attribute\CustomerOptionValue.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\attribute\ProductOption.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\common\audit\AuditSection.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\image\ProductImage.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\business\exception\ServiceException.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\tax\TaxBasisCalculation.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\shoppingcart\ShoppingCartItem.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\common\Billing.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\reference\currency\Currency.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\attribute\ProductOptionValueDescription.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\ProductList.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\system\SystemNotification.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\payments\PaymentMethod.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\shipping\ShippingDescription.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\order\orderaccount\OrderAccount.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\review\ProductReviewDescription.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\customer\attribute\CustomerOptionType.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\merchant\MerchantStore.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\content\ContentType.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\payments\Payment.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\shipping\ShippingMetaData.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\manufacturer\Manufacturer.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\order\filehistory\FileHistory.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\shipping\ShippingSummary.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\common\Address.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\common\Delivery.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\business\exception\ConversionException.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\price\FinalPrice.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\tax\taxrate\TaxRate.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\reference\geozone\GeoZone.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\price\ProductPriceType.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\reference\country\Country.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\attribute\ProductOptionDescription.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\shipping\ShippingOrigin.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\price\ProductPrice.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\user\Group.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\order\orderaccount\OrderAccountProduct.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\customer\CustomerGender.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\order\orderproduct\OrderProduct.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\search\SearchResponse.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\relationship\ProductRelationship.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\tax\taxrate\TaxRateDescription.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\attribute\ProductAttribute.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\attribute\ProductOptionValue.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\tax\taxclass\TaxClass.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\file\ProductImageSize.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\order\orderstatus\OrderStatus.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\content\ContentDescription.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\order\OrderValueType.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\price\ProductPriceDescription.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\user\PermissionList.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\content\OutputContentFile.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\system\MerchantConfigurationType.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\system\optin\Optin.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\order\OrderTotalItem.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\description\ProductDescription.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\constants\SchemaConstant.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\shipping\ShippingConfiguration.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\reference\country\CountryDescription.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\system\MerchantConfiguration.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\user\Permission.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\system\MerchantLog.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\search\SearchEntry.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\generic\SalesManagerEntity.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\payments\PaypalPayment.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\order\OrderSummary.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\payments\TransactionType.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\user\PermissionCriteria.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\payments\BasicPayment.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\system\IntegrationModule.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\tax\TaxConfiguration.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\reference\geozone\GeoZoneDescription.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\order\OrderChannel.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\utils\CloneUtils.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\shoppingcart\ShoppingCart.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\ProductCriteria.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\customer\attribute\CustomerOptionDescription.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\user\GroupType.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\order\OrderList.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\shipping\ShippingBasisType.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\shipping\ShippingOptionPriceType.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\system\optin\CustomerOptin.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\shipping\ShippingProduct.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\common\Criteria.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\order\OrderType.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\search\IndexProduct.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\common\audit\Auditable.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\shipping\ShippingQuote.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\shipping\PackageDetails.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\order\OrderCriteria.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\order\orderproduct\OrderProductPrice.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\system\ModuleConfig.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\content\Content.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\content\ContentPosition.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\payments\CreditCardType.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\customer\attribute\CustomerOption.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\manufacturer\ManufacturerDescription.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\category\Category.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\attribute\ProductOptionType.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\common\CriteriaOrderBy.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\customer\attribute\CustomerAttribute.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\system\SystemConfiguration.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\customer\CustomerCriteria.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\constants\MeasureUnit.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\order\orderstatus\OrderStatusHistory.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\shipping\ShippingPackageType.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\common\audit\AuditListener.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\reference\zone\ZoneDescription.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\order\Order.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\shipping\ShippingOption.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\image\ProductImageDescription.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\catalog\product\review\ProductReview.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\customer\attribute\CustomerOptionValueDescription.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\tax\TaxItem.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\system\IntegrationConfiguration.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\system\Environment.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\payments\CreditCardPayment.java
+C:\code\personal\shopizer-2.0.5\shopizer\sm-core-model\src\main\java\com\salesmanager\core\model\system\Module.java

diff --git a/sm-core-modules/target/classes/.gitignore b/sm-core-modules/target/classes/.gitignore
index 0fb5df8..3385916 100644
--- a/sm-core-modules/target/classes/.gitignore
+++ b/sm-core-modules/target/classes/.gitignore
@@ -1,2 +1 @@
-/com/
 /META-INF/

diff --git a/sm-core-modules/target/classes/com/salesmanager/core/modules/constants/Constants.class b/sm-core-modules/target/classes/com/salesmanager/core/modules/constants/Constants.class
new file mode 100644
index 0000000..fd9ff0a
Binary files /dev/null and b/sm-core-modules/target/classes/com/salesmanager/core/modules/constants/Constants.class differ

diff --git a/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/IntegrationException.class b/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/IntegrationException.class
new file mode 100644
index 0000000..8190879
Binary files /dev/null and b/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/IntegrationException.class differ

diff --git a/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/payment/model/PaymentModule.class b/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/payment/model/PaymentModule.class
new file mode 100644
index 0000000..2e06b37
Binary files /dev/null and b/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/payment/model/PaymentModule.class differ

diff --git a/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuoteItem.class b/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuoteItem.class
new file mode 100644
index 0000000..56a2836
Binary files /dev/null and b/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuoteItem.class differ

diff --git a/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuotesConfiguration.class b/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuotesConfiguration.class
new file mode 100644
index 0000000..eedea34
Binary files /dev/null and b/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuotesConfiguration.class differ

diff --git a/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuotesRegion.class b/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuotesRegion.class
new file mode 100644
index 0000000..4059592
Binary files /dev/null and b/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuotesRegion.class differ

diff --git a/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuoteWeightItem.class b/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuoteWeightItem.class
new file mode 100644
index 0000000..9b198cc
Binary files /dev/null and b/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/CustomShippingQuoteWeightItem.class differ

diff --git a/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/Packaging.class b/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/Packaging.class
new file mode 100644
index 0000000..3f77e99
Binary files /dev/null and b/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/Packaging.class differ

diff --git a/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/ShippingQuoteModule.class b/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/ShippingQuoteModule.class
new file mode 100644
index 0000000..3bba4cf
Binary files /dev/null and b/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/ShippingQuoteModule.class differ

diff --git a/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/ShippingQuotePrePostProcessModule.class b/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/ShippingQuotePrePostProcessModule.class
new file mode 100644
index 0000000..00bb149
Binary files /dev/null and b/sm-core-modules/target/classes/com/salesmanager/core/modules/integration/shipping/model/ShippingQuotePrePostProcessModule.class differ

diff --git a/sm-core-modules/target/classes/com/salesmanager/core/modules/utils/Encryption.class b/sm-core-modules/target/classes/com/salesmanager/core/modules/utils/Encryption.class
new file mode 100644
index 0000000..1406d59
Binary files /dev/null and b/sm-core-modules/target/classes/com/salesmanager/core/modules/utils/Encryption.class differ

diff --git a/sm-core-modules/target/classes/com/salesmanager/core/modules/utils/GeoLocation.class b/sm-core-modules/target/classes/com/salesmanager/core/modules/utils/GeoLocation.class
new file mode 100644
index 0000000..e08c5a0
Binary files /dev/null and b/sm-core-modules/target/classes/com/salesmanager/core/modules/utils/GeoLocation.class differ

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 a707950..a7f3db7 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
-#Thu Oct 27 12:29:22 EDT 2016
+#Fri Oct 28 08:24:24 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-core-modules

diff --git a/sm-search/.classpath b/sm-search/.classpath
index fc5f96c..5cad398 100644
--- a/sm-search/.classpath
+++ b/sm-search/.classpath
@@ -27,7 +27,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_91">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/sm-search/target/classes/.gitignore b/sm-search/target/classes/.gitignore
index 0fb5df8..3385916 100644
--- a/sm-search/target/classes/.gitignore
+++ b/sm-search/target/classes/.gitignore
@@ -1,2 +1 @@
-/com/
 /META-INF/

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 800f392..ab14ea5 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
-#Thu Oct 27 12:29:25 EDT 2016
+#Fri Oct 28 08:24:28 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-search

diff --git a/sm-shop/.classpath b/sm-shop/.classpath
index 81c8c83..6d3851d 100644
--- a/sm-shop/.classpath
+++ b/sm-shop/.classpath
@@ -28,7 +28,7 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_91">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/product/PersistableProduct.java b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/product/PersistableProduct.java
index d430cf3..eb63df4 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/product/PersistableProduct.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/product/PersistableProduct.java
@@ -3,6 +3,10 @@ package com.salesmanager.shop.model.catalog.product;
 import java.io.Serializable;
 import java.util.List;
 
+import com.salesmanager.shop.model.catalog.category.Category;
+import com.salesmanager.shop.model.catalog.manufacturer.Manufacturer;
+import com.salesmanager.shop.model.catalog.product.attribute.PersistableProductAttribute;
+
 
 
 public class PersistableProduct extends ProductEntity implements Serializable {

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/PersistableCategoryPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/PersistableCategoryPopulator.java
index 0d9ff13..26da4ec 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/PersistableCategoryPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/PersistableCategoryPopulator.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.populator.catalog;
+package com.salesmanager.shop.populator.catalog;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,15 +7,16 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.Validate;
 import org.apache.commons.lang3.StringUtils;
 
-import com.salesmanager.core.business.catalog.category.model.Category;
-import com.salesmanager.core.business.catalog.category.service.CategoryService;
-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.business.reference.language.service.LanguageService;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.catalog.category.CategoryDescription;
-import com.salesmanager.web.entity.catalog.category.PersistableCategory;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.services.catalog.category.CategoryService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+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.model.catalog.category.CategoryDescription;
+import com.salesmanager.shop.model.catalog.category.PersistableCategory;
+
 
 public class PersistableCategoryPopulator extends
 		AbstractDataPopulator<PersistableCategory, Category> {
@@ -105,9 +106,9 @@ public class PersistableCategoryPopulator extends
 
 		
 		if(!CollectionUtils.isEmpty(source.getDescriptions())) {
-			List<com.salesmanager.core.business.catalog.category.model.CategoryDescription> descriptions = new ArrayList<com.salesmanager.core.business.catalog.category.model.CategoryDescription>();
+			List<com.salesmanager.core.model.catalog.category.CategoryDescription> descriptions = new ArrayList<com.salesmanager.core.model.catalog.category.CategoryDescription>();
 			for(CategoryDescription description : source.getDescriptions()) {
-				com.salesmanager.core.business.catalog.category.model.CategoryDescription desc = new com.salesmanager.core.business.catalog.category.model.CategoryDescription();
+				com.salesmanager.core.model.catalog.category.CategoryDescription desc = new com.salesmanager.core.model.catalog.category.CategoryDescription();
 				desc.setCategory(target);
 				desc.setCategoryHighlight(description.getHighlights());
 				desc.setDescription(description.getDescription());

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/PersistableProductOptionPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/PersistableProductOptionPopulator.java
index 032978e..69326a7 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/PersistableProductOptionPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/PersistableProductOptionPopulator.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.populator.catalog;
+package com.salesmanager.shop.populator.catalog;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -6,14 +6,17 @@ import java.util.Set;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.Validate;
 
-import com.salesmanager.core.business.catalog.product.model.attribute.ProductOption;
-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.business.reference.language.service.LanguageService;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.catalog.product.attribute.PersistableProductOption;
-import com.salesmanager.web.entity.catalog.product.attribute.ProductOptionDescription;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.catalog.product.attribute.ProductOption;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.model.catalog.product.attribute.PersistableProductOption;
+import com.salesmanager.shop.model.catalog.product.attribute.ProductOptionDescription;
+
+
+
 
 public class PersistableProductOptionPopulator extends
 		AbstractDataPopulator<PersistableProductOption, ProductOption> {
@@ -43,9 +46,9 @@ public class PersistableProductOptionPopulator extends
 			target.setCode(source.getCode());
 			
 			if(!CollectionUtils.isEmpty(source.getDescriptions())) {
-				Set<com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionDescription> descriptions = new HashSet<com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionDescription>();
+				Set<com.salesmanager.core.model.catalog.product.attribute.ProductOptionDescription> descriptions = new HashSet<com.salesmanager.core.model.catalog.product.attribute.ProductOptionDescription>();
 				for(ProductOptionDescription desc  : source.getDescriptions()) {
-					com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionDescription description = new com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionDescription();
+					com.salesmanager.core.model.catalog.product.attribute.ProductOptionDescription description = new com.salesmanager.core.model.catalog.product.attribute.ProductOptionDescription();
 					Language lang = languageService.getByCode(desc.getLanguage());
 					if(lang==null) {
 						throw new ConversionException("Language is null for code " + description.getLanguage() + " use language ISO code [en, fr ...]");

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/PersistableProductOptionValuePopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/PersistableProductOptionValuePopulator.java
index c262001..681b850 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/PersistableProductOptionValuePopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/PersistableProductOptionValuePopulator.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.populator.catalog;
+package com.salesmanager.shop.populator.catalog;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -6,14 +6,16 @@ import java.util.Set;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.Validate;
 
-import com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionValue;
-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.business.reference.language.service.LanguageService;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.catalog.product.attribute.PersistableProductOptionValue;
-import com.salesmanager.web.entity.catalog.product.attribute.ProductOptionValueDescription;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.catalog.product.attribute.ProductOptionValue;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.model.catalog.product.attribute.PersistableProductOptionValue;
+import com.salesmanager.shop.model.catalog.product.attribute.ProductOptionValueDescription;
+
+
 
 /**
  * Converts a PersistableProductOptionValue to
@@ -51,9 +53,9 @@ public class PersistableProductOptionValuePopulator extends
 			target.setCode(source.getCode());
 			
 			if(!CollectionUtils.isEmpty(source.getDescriptions())) {
-				Set<com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionValueDescription> descriptions = new HashSet<com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionValueDescription>();
+				Set<com.salesmanager.core.model.catalog.product.attribute.ProductOptionValueDescription> descriptions = new HashSet<com.salesmanager.core.model.catalog.product.attribute.ProductOptionValueDescription>();
 				for(ProductOptionValueDescription desc  : source.getDescriptions()) {
-					com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionValueDescription description = new com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionValueDescription();
+					com.salesmanager.core.model.catalog.product.attribute.ProductOptionValueDescription description = new com.salesmanager.core.model.catalog.product.attribute.ProductOptionValueDescription();
 					Language lang = languageService.getByCode(desc.getLanguage());
 					if(lang==null) {
 						throw new ConversionException("Language is null for code " + description.getLanguage() + " use language ISO code [en, fr ...]");

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/PersistableProductPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/PersistableProductPopulator.java
index 1c72689..5d6d63c 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/PersistableProductPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/PersistableProductPopulator.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.populator.catalog;
+package com.salesmanager.shop.populator.catalog;
 
 import java.io.ByteArrayInputStream;
 import java.math.BigDecimal;
@@ -12,31 +12,33 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.Validate;
 import org.apache.commons.lang3.StringUtils;
 
-import com.salesmanager.core.business.catalog.category.model.Category;
-import com.salesmanager.core.business.catalog.category.service.CategoryService;
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.attribute.ProductAttribute;
-import com.salesmanager.core.business.catalog.product.model.attribute.ProductOption;
-import com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionValue;
-import com.salesmanager.core.business.catalog.product.model.availability.ProductAvailability;
-import com.salesmanager.core.business.catalog.product.model.description.ProductDescription;
-import com.salesmanager.core.business.catalog.product.model.image.ProductImage;
-import com.salesmanager.core.business.catalog.product.model.manufacturer.Manufacturer;
-import com.salesmanager.core.business.catalog.product.model.price.ProductPrice;
-import com.salesmanager.core.business.catalog.product.model.price.ProductPriceDescription;
-import com.salesmanager.core.business.catalog.product.service.attribute.ProductOptionService;
-import com.salesmanager.core.business.catalog.product.service.attribute.ProductOptionValueService;
-import com.salesmanager.core.business.catalog.product.service.manufacturer.ManufacturerService;
-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.business.reference.language.service.LanguageService;
-import com.salesmanager.core.business.tax.service.TaxClassService;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.catalog.product.PersistableImage;
-import com.salesmanager.web.entity.catalog.product.PersistableProduct;
-import com.salesmanager.web.entity.catalog.product.ProductPriceEntity;
-import com.salesmanager.web.utils.DateUtil;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.services.catalog.category.CategoryService;
+import com.salesmanager.core.business.services.catalog.product.attribute.ProductOptionService;
+import com.salesmanager.core.business.services.catalog.product.attribute.ProductOptionValueService;
+import com.salesmanager.core.business.services.catalog.product.manufacturer.ManufacturerService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.services.tax.TaxClassService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.catalog.category.Category;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.attribute.ProductAttribute;
+import com.salesmanager.core.model.catalog.product.attribute.ProductOption;
+import com.salesmanager.core.model.catalog.product.attribute.ProductOptionValue;
+import com.salesmanager.core.model.catalog.product.availability.ProductAvailability;
+import com.salesmanager.core.model.catalog.product.description.ProductDescription;
+import com.salesmanager.core.model.catalog.product.image.ProductImage;
+import com.salesmanager.core.model.catalog.product.manufacturer.Manufacturer;
+import com.salesmanager.core.model.catalog.product.price.ProductPrice;
+import com.salesmanager.core.model.catalog.product.price.ProductPriceDescription;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.model.catalog.product.PersistableImage;
+import com.salesmanager.shop.model.catalog.product.PersistableProduct;
+import com.salesmanager.shop.model.catalog.product.ProductPriceEntity;
+import com.salesmanager.shop.utils.DateUtil;
+
+
 
 public class PersistableProductPopulator extends
 		AbstractDataPopulator<PersistableProduct, Product> {
@@ -101,7 +103,7 @@ public class PersistableProductPopulator extends
 			List<Language> languages = new ArrayList<Language>();
 			Set<ProductDescription> descriptions = new HashSet<ProductDescription>();
 			if(!CollectionUtils.isEmpty(source.getDescriptions())) {
-				for(com.salesmanager.web.entity.catalog.product.ProductDescription description : source.getDescriptions()) {
+				for(com.salesmanager.shop.model.catalog.product.ProductDescription description : source.getDescriptions()) {
 					
 					ProductDescription productDescription = new ProductDescription();
 					productDescription.setProduct(target);
@@ -216,7 +218,7 @@ public class PersistableProductPopulator extends
 			
 			//attributes
 			if(source.getAttributes()!=null) {
-				for(com.salesmanager.web.entity.catalog.product.attribute.ProductAttributeEntity attr : source.getAttributes()) {
+				for(com.salesmanager.shop.model.catalog.product.attribute.ProductAttributeEntity attr : source.getAttributes()) {
 					
 					ProductOption productOption = null;
 							
@@ -266,7 +268,7 @@ public class PersistableProductPopulator extends
 			
 			//categories
 			if(!CollectionUtils.isEmpty(source.getCategories())) {
-				for(com.salesmanager.web.entity.catalog.category.Category categ : source.getCategories()) {
+				for(com.salesmanager.shop.model.catalog.category.Category categ : source.getCategories()) {
 					
 					Category c = null;
 					if(!StringUtils.isBlank(categ.getCode())) {

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/PersistableProductReviewPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/PersistableProductReviewPopulator.java
index dd92f60..4e22873 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/PersistableProductReviewPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/PersistableProductReviewPopulator.java
@@ -1,24 +1,27 @@
-package com.salesmanager.web.populator.catalog;
+package com.salesmanager.shop.populator.catalog;
 
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.inject.Inject;
+
 import org.apache.commons.lang.Validate;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.review.ProductReview;
-import com.salesmanager.core.business.catalog.product.model.review.ProductReviewDescription;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.customer.service.CustomerService;
-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.business.reference.language.service.LanguageService;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.catalog.product.PersistableProductReview;
-import com.shopizer.search.utils.DateUtil;
+
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.customer.CustomerService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.review.ProductReview;
+import com.salesmanager.core.model.catalog.product.review.ProductReviewDescription;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.model.catalog.product.PersistableProductReview;
+import com.salesmanager.shop.utils.DateUtil;
+
+
 
 public class PersistableProductReviewPopulator extends
 		AbstractDataPopulator<PersistableProductReview, ProductReview> {
@@ -67,7 +70,7 @@ public class PersistableProductReviewPopulator extends
 				throw new ConversionException("Invalid customer id for the given store");
 			}
 			
-			target.setReviewDate(DateUtil.formatDate(source.getDate()));
+			target.setReviewDate(DateUtil.getDate(source.getDate()));
 			target.setCustomer(customer);
 			target.setReviewRating(source.getRating());
 			

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableCategoryPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableCategoryPopulator.java
index 4ea2903..657ae51 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableCategoryPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableCategoryPopulator.java
@@ -1,12 +1,14 @@
-package com.salesmanager.web.populator.catalog;
+package com.salesmanager.shop.populator.catalog;
 
-import com.salesmanager.core.business.catalog.category.model.Category;
-import com.salesmanager.core.business.catalog.category.model.CategoryDescription;
-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.catalog.category.ReadableCategory;
+
+
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.catalog.category.Category;
+import com.salesmanager.core.model.catalog.category.CategoryDescription;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.model.catalog.category.ReadableCategory;
 
 public class ReadableCategoryPopulator extends
 		AbstractDataPopulator<Category, ReadableCategory> {
@@ -32,7 +34,7 @@ public class ReadableCategoryPopulator extends
 		
 		
 			if(description!=null) {
-				com.salesmanager.web.entity.catalog.category.CategoryDescription desc = new com.salesmanager.web.entity.catalog.category.CategoryDescription();
+				com.salesmanager.shop.model.catalog.category.CategoryDescription desc = new com.salesmanager.shop.model.catalog.category.CategoryDescription();
 				desc.setFriendlyUrl(description.getSeUrl());
 				desc.setName(description.getName());
 				desc.setDescription(description.getName());
@@ -47,7 +49,7 @@ public class ReadableCategoryPopulator extends
 		}
 		
 		if(source.getParent()!=null) {
-			com.salesmanager.web.entity.catalog.category.Category parent = new com.salesmanager.web.entity.catalog.category.Category();
+			com.salesmanager.shop.model.catalog.category.Category parent = new com.salesmanager.shop.model.catalog.category.Category();
 			parent.setCode(source.getParent().getCode());
 			parent.setId(source.getParent().getId());
 			target.setParent(parent);

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableFinalPricePopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableFinalPricePopulator.java
index c62b0b1..d9a74de 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableFinalPricePopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableFinalPricePopulator.java
@@ -1,14 +1,14 @@
-package com.salesmanager.web.populator.catalog;
+package com.salesmanager.shop.populator.catalog;
 
 import org.apache.commons.lang.Validate;
 
-import com.salesmanager.core.business.catalog.product.model.price.FinalPrice;
-import com.salesmanager.core.business.catalog.product.service.PricingService;
-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.catalog.product.ReadableProductPrice;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.services.catalog.product.PricingService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.catalog.product.price.FinalPrice;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.model.catalog.product.ReadableProductPrice;
 
 public class ReadableFinalPricePopulator extends
 		AbstractDataPopulator<FinalPrice, ReadableProductPrice> {

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableProductPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableProductPopulator.java
index b5f02c1..0cc3990 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableProductPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableProductPopulator.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.populator.catalog;
+package com.salesmanager.shop.populator.catalog;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,23 +8,25 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.Validate;
 import org.apache.commons.lang3.StringUtils;
 
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.category.model.Category;
-import com.salesmanager.core.business.catalog.product.model.availability.ProductAvailability;
-import com.salesmanager.core.business.catalog.product.model.description.ProductDescription;
-import com.salesmanager.core.business.catalog.product.model.image.ProductImage;
-import com.salesmanager.core.business.catalog.product.model.manufacturer.ManufacturerDescription;
-import com.salesmanager.core.business.catalog.product.model.price.FinalPrice;
-import com.salesmanager.core.business.catalog.product.service.PricingService;
-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.constants.Constants;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.catalog.ReadableImage;
-import com.salesmanager.web.entity.catalog.manufacturer.ReadableManufacturer;
-import com.salesmanager.web.entity.catalog.product.ReadableProduct;
-import com.salesmanager.web.utils.ImageFilePath;
+import com.salesmanager.core.business.constants.Constants;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.services.catalog.product.PricingService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.catalog.category.Category;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.availability.ProductAvailability;
+import com.salesmanager.core.model.catalog.product.description.ProductDescription;
+import com.salesmanager.core.model.catalog.product.image.ProductImage;
+import com.salesmanager.core.model.catalog.product.manufacturer.ManufacturerDescription;
+import com.salesmanager.core.model.catalog.product.price.FinalPrice;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.model.catalog.ReadableImage;
+import com.salesmanager.shop.model.catalog.manufacturer.ReadableManufacturer;
+import com.salesmanager.shop.model.catalog.product.ReadableProduct;
+import com.salesmanager.shop.utils.ImageFilePath;
+
+
 
 public class ReadableProductPopulator extends
 		AbstractDataPopulator<Product, ReadableProduct> {
@@ -93,7 +95,7 @@ public class ReadableProductPopulator extends
 				target.setRatingCount(source.getProductReviewCount().intValue());
 			}
 			if(description!=null) {
-				com.salesmanager.web.entity.catalog.product.ProductDescription tragetDescription = new com.salesmanager.web.entity.catalog.product.ProductDescription();
+				com.salesmanager.shop.model.catalog.product.ProductDescription tragetDescription = new com.salesmanager.shop.model.catalog.product.ProductDescription();
 				tragetDescription.setFriendlyUrl(description.getSeUrl());
 				tragetDescription.setName(description.getName());
 				if(!StringUtils.isBlank(description.getMetatagTitle())) {
@@ -110,7 +112,7 @@ public class ReadableProductPopulator extends
 			if(source.getManufacturer()!=null) {
 				ManufacturerDescription manufacturer = source.getManufacturer().getDescriptions().iterator().next(); 
 				ReadableManufacturer manufacturerEntity = new ReadableManufacturer();
-				com.salesmanager.web.entity.catalog.manufacturer.ManufacturerDescription d = new com.salesmanager.web.entity.catalog.manufacturer.ManufacturerDescription(); 
+				com.salesmanager.shop.model.catalog.manufacturer.ManufacturerDescription d = new com.salesmanager.shop.model.catalog.manufacturer.ManufacturerDescription(); 
 				d.setName(manufacturer.getName());
 				manufacturerEntity.setDescription(d);
 				manufacturerEntity.setId(manufacturer.getId());

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableProductPricePopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableProductPricePopulator.java
index 1327452..5ad6992 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableProductPricePopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableProductPricePopulator.java
@@ -1,15 +1,17 @@
-package com.salesmanager.web.populator.catalog;
+package com.salesmanager.shop.populator.catalog;
 
 import org.apache.commons.lang.Validate;
 
-import com.salesmanager.core.business.catalog.product.model.price.FinalPrice;
-import com.salesmanager.core.business.catalog.product.model.price.ProductPrice;
-import com.salesmanager.core.business.catalog.product.service.PricingService;
-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.catalog.product.ReadableProductPrice;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.services.catalog.product.PricingService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.catalog.product.price.FinalPrice;
+import com.salesmanager.core.model.catalog.product.price.ProductPrice;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.model.catalog.product.ReadableProductPrice;
+
+
 
 public class ReadableProductPricePopulator extends
 		AbstractDataPopulator<ProductPrice, ReadableProductPrice> {

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableProductReviewPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableProductReviewPopulator.java
index 66a91e8..9cff0f4 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableProductReviewPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/catalog/ReadableProductReviewPopulator.java
@@ -1,18 +1,17 @@
-package com.salesmanager.web.populator.catalog;
+package com.salesmanager.shop.populator.catalog;
 
 import java.util.Set;
 
-
-import com.salesmanager.core.business.catalog.product.model.review.ProductReview;
-import com.salesmanager.core.business.catalog.product.model.review.ProductReviewDescription;
-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.catalog.product.ReadableProductReview;
-import com.salesmanager.web.entity.customer.ReadableCustomer;
-import com.salesmanager.web.populator.customer.ReadableCustomerPopulator;
-import com.salesmanager.web.utils.DateUtil;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.catalog.product.review.ProductReview;
+import com.salesmanager.core.model.catalog.product.review.ProductReviewDescription;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.model.catalog.product.ReadableProductReview;
+import com.salesmanager.shop.model.customer.ReadableCustomer;
+import com.salesmanager.shop.populator.customer.ReadableCustomerPopulator;
+import com.salesmanager.shop.utils.DateUtil;
 
 public class ReadableProductReviewPopulator extends
 		AbstractDataPopulator<ProductReview, ReadableProductReview> {

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/ReadableCustomerPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/ReadableCustomerPopulator.java
index 3ffed6e..06e33ec 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/ReadableCustomerPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/ReadableCustomerPopulator.java
@@ -1,18 +1,18 @@
-package com.salesmanager.web.populator.customer;
+package com.salesmanager.shop.populator.customer;
 
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.customer.model.attribute.CustomerAttribute;
-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.customer.Address;
-import com.salesmanager.web.entity.customer.ReadableCustomer;
-import com.salesmanager.web.entity.customer.attribute.CustomerOptionDescription;
-import com.salesmanager.web.entity.customer.attribute.CustomerOptionValueDescription;
-import com.salesmanager.web.entity.customer.attribute.ReadableCustomerAttribute;
-import com.salesmanager.web.entity.customer.attribute.ReadableCustomerOption;
-import com.salesmanager.web.entity.customer.attribute.ReadableCustomerOptionValue;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.model.customer.attribute.CustomerAttribute;
+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.shop.model.customer.ReadableCustomer;
+import com.salesmanager.shop.model.customer.attribute.CustomerOptionDescription;
+import com.salesmanager.shop.model.customer.attribute.CustomerOptionValueDescription;
+import com.salesmanager.shop.model.customer.attribute.ReadableCustomerAttribute;
+import com.salesmanager.shop.model.customer.attribute.ReadableCustomerOption;
+import com.salesmanager.shop.model.customer.attribute.ReadableCustomerOptionValue;
 
 public class ReadableCustomerPopulator extends
 		AbstractDataPopulator<Customer, ReadableCustomer> {

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/PersistableProduct.class b/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/PersistableProduct.class
index e189c1e..f2072cc 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/PersistableProduct.class and b/sm-shop/target/classes/com/salesmanager/shop/model/catalog/product/PersistableProduct.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableCategoryPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableCategoryPopulator.class
index 9ec0813..d1d0043 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableCategoryPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableCategoryPopulator.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductOptionPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductOptionPopulator.class
index 24dc92a..4cd7f20 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductOptionPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductOptionPopulator.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductOptionValuePopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductOptionValuePopulator.class
index 966f8de..f2d3d30 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductOptionValuePopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductOptionValuePopulator.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductPopulator.class
index ccdd936..7f46346 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductPopulator.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductReviewPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductReviewPopulator.class
index 439f0af..cf24572 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductReviewPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/PersistableProductReviewPopulator.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableCategoryPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableCategoryPopulator.class
index 3f8e535..d649641 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableCategoryPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableCategoryPopulator.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableFinalPricePopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableFinalPricePopulator.class
index 934a401..7be20e7 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableFinalPricePopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableFinalPricePopulator.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableProductPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableProductPopulator.class
index 5d5785d..4542e42 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableProductPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableProductPopulator.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableProductPricePopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableProductPricePopulator.class
index be99f14..7d48ece 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableProductPricePopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableProductPricePopulator.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableProductReviewPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableProductReviewPopulator.class
index f5147be..8bca01c 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableProductReviewPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/catalog/ReadableProductReviewPopulator.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/ReadableCustomerPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/ReadableCustomerPopulator.class
index 76a40b5..97d9407 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/ReadableCustomerPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/ReadableCustomerPopulator.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 54e0458..2c2bf00 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
-#Thu Oct 27 12:29:29 EDT 2016
+#Fri Oct 28 08:24:32 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-shop