shopizer-developers

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 1532148..9c22a6f 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:31:58 EDT 2016
+#Mon Oct 31 12:08:47 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 fa6b405..ef5f565 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:31:56 EDT 2016
+#Mon Oct 31 12:08:43 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 2bc7d14..2f1c2db 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:31:57 EDT 2016
+#Mon Oct 31 12:08:44 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 e4522cd..25ae38b 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:32:00 EDT 2016
+#Mon Oct 31 12:08:48 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 fa1b315..d3e460e 100644
--- a/sm-shop/pom.xml
+++ b/sm-shop/pom.xml
@@ -71,7 +71,7 @@
 	        <groupId>org.springframework.boot</groupId>
 	        <artifactId>spring-boot-starter-security</artifactId>
 	    </dependency>
- 
+
         
         <!-- H2 session -->
         <dependency>

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/category/ShoppingCategoryController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/category/ShoppingCategoryController.java
index 96b5a20..631f91e 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/category/ShoppingCategoryController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/category/ShoppingCategoryController.java
@@ -1,13 +1,15 @@
-package com.salesmanager.web.shop.controller.category;
+package com.salesmanager.shop.store.controller.category;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
+import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -15,7 +17,6 @@ import org.apache.commons.collections.CollectionUtils;
 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.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -23,37 +24,36 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-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.ProductCriteria;
-import com.salesmanager.core.business.catalog.product.service.PricingService;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.catalog.product.service.manufacturer.ManufacturerService;
-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.core.business.reference.language.service.LanguageService;
-import com.salesmanager.core.utils.CacheUtils;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.entity.catalog.ProductList;
-import com.salesmanager.web.entity.catalog.category.ReadableCategory;
-import com.salesmanager.web.entity.catalog.manufacturer.ReadableManufacturer;
-import com.salesmanager.web.entity.catalog.product.ReadableProduct;
-import com.salesmanager.web.entity.shop.Breadcrumb;
-import com.salesmanager.web.entity.shop.PageInformation;
-import com.salesmanager.web.populator.catalog.ReadableCategoryPopulator;
-import com.salesmanager.web.populator.catalog.ReadableProductPopulator;
-import com.salesmanager.web.populator.manufacturer.ReadableManufacturerPopulator;
-import com.salesmanager.web.shop.controller.ControllerConstants;
-import com.salesmanager.web.shop.model.filter.QueryFilter;
-import com.salesmanager.web.shop.model.filter.QueryFilterType;
-import com.salesmanager.web.utils.BreadcrumbsUtils;
-import com.salesmanager.web.utils.ImageFilePath;
-import com.salesmanager.web.utils.LabelUtils;
-import com.salesmanager.web.utils.PageBuilderUtils;
-
-import edu.emory.mathcs.backport.java.util.Collections;
+import com.salesmanager.core.business.services.catalog.category.CategoryService;
+import com.salesmanager.core.business.services.catalog.product.PricingService;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.catalog.product.manufacturer.ManufacturerService;
+import com.salesmanager.core.business.services.merchant.MerchantStoreService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.utils.CacheUtils;
+import com.salesmanager.core.model.catalog.category.Category;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.ProductCriteria;
+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.ProductList;
+import com.salesmanager.shop.model.catalog.category.ReadableCategory;
+import com.salesmanager.shop.model.catalog.manufacturer.ReadableManufacturer;
+import com.salesmanager.shop.model.catalog.product.ReadableProduct;
+import com.salesmanager.shop.model.shop.Breadcrumb;
+import com.salesmanager.shop.model.shop.PageInformation;
+import com.salesmanager.shop.populator.catalog.ReadableCategoryPopulator;
+import com.salesmanager.shop.populator.catalog.ReadableProductPopulator;
+import com.salesmanager.shop.populator.manufacturer.ReadableManufacturerPopulator;
+import com.salesmanager.shop.store.controller.ControllerConstants;
+import com.salesmanager.shop.store.model.filter.QueryFilter;
+import com.salesmanager.shop.store.model.filter.QueryFilterType;
+import com.salesmanager.shop.utils.BreadcrumbsUtils;
+import com.salesmanager.shop.utils.ImageFilePath;
+import com.salesmanager.shop.utils.LabelUtils;
+import com.salesmanager.shop.utils.PageBuilderUtils;
+
 
 
 /**
@@ -295,7 +295,7 @@ public class ShoppingCategoryController {
 					//Boolean missedContent = (Boolean)cache.getFromCache(manufacturersKeyMissed.toString());
 					//if(missedContent==null) {
 						manufacturerList = this.getManufacturers(store, subCategoryIds, language);
-						if(CollectionUtils.isEmpty(manufacturerList)) {
+						if(manufacturerList.isEmpty()) {
 							cache.putInCache(new Boolean(true), manufacturersKeyMissed.toString());
 						} else {
 							//cache.putInCache(manufacturerList, manufacturersKey.toString());
@@ -311,10 +311,10 @@ public class ShoppingCategoryController {
 		
 	private List<ReadableManufacturer> getManufacturers(MerchantStore store, List<Long> ids, Language language) throws Exception {
 		List<ReadableManufacturer> manufacturerList = null;
-		List<com.salesmanager.core.business.catalog.product.model.manufacturer.Manufacturer> manufacturers = manufacturerService.listByProductsByCategoriesId(store, ids, language);
-		if(!CollectionUtils.isEmpty(manufacturers)) {
+		List<com.salesmanager.core.model.catalog.product.manufacturer.Manufacturer> manufacturers = manufacturerService.listByProductsByCategoriesId(store, ids, language);
+		if(!manufacturers.isEmpty()) {
 			manufacturerList = new ArrayList<ReadableManufacturer>();
-			for(com.salesmanager.core.business.catalog.product.model.manufacturer.Manufacturer manufacturer : manufacturers) {
+			for(com.salesmanager.core.model.catalog.product.manufacturer.Manufacturer manufacturer : manufacturers) {
 				ReadableManufacturer manuf = new ReadableManufacturerPopulator().populate(manufacturer, new ReadableManufacturer(), store, language);
 				manufacturerList.add(manuf);
 				
@@ -325,7 +325,7 @@ public class ShoppingCategoryController {
 	
 	private Map<Long,Long> getProductsByCategory(MerchantStore store, Category category, String lineage, List<Category> subCategories) throws Exception {
 
-		if(CollectionUtils.isEmpty(subCategories)) {
+		if(subCategories.isEmpty()) {
 			return null;
 		}
 		List<Long> ids = new ArrayList<Long>();
@@ -506,7 +506,7 @@ public class ShoppingCategoryController {
 				lang = langs.get(Constants.DEFAULT_LANGUAGE);
 			}
 			
-			List<com.salesmanager.core.business.catalog.product.model.Product> products = productService.getProducts(ids, lang);
+			List<com.salesmanager.core.model.catalog.product.Product> products = productService.getProducts(ids, lang);
 			
 			ProductList productList = new ProductList();
 			
@@ -666,7 +666,7 @@ public class ShoppingCategoryController {
 				}
 			}
 
-			com.salesmanager.core.business.catalog.product.model.ProductList products = productService.listByStore(merchantStore, lang, productCriteria);
+			com.salesmanager.core.model.catalog.product.ProductList products = productService.listByStore(merchantStore, lang, productCriteria);
 
 			ReadableProductPopulator populator = new ReadableProductPopulator();
 			populator.setPricingService(pricingService);

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/search/facade/SearchFacade.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/search/facade/SearchFacade.java
index 49e9be0..f5e4aba 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/search/facade/SearchFacade.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/search/facade/SearchFacade.java
@@ -1,6 +1,6 @@
-package com.salesmanager.web.shop.controller.search.facade;
+package com.salesmanager.shop.store.controller.search.facade;
 
-import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.model.merchant.MerchantStore;
 
 /**
  * Different services for searching and indexing data

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/search/facade/SearchFacadeImpl.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/search/facade/SearchFacadeImpl.java
index 31a09c0..3b03d66 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/search/facade/SearchFacadeImpl.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/search/facade/SearchFacadeImpl.java
@@ -1,15 +1,17 @@
-package com.salesmanager.web.shop.controller.search.facade;
+package com.salesmanager.shop.store.controller.search.facade;
 
 import java.util.List;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
+
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.search.service.SearchService;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.search.SearchService;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.merchant.MerchantStore;
+
 
 @Service("searchFacade")
 public class SearchFacadeImpl implements SearchFacade {

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/model/catalog/Attribute.java b/sm-shop/src/main/java/com/salesmanager/shop/store/model/catalog/Attribute.java
index 111c1ee..1b2d36f 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/model/catalog/Attribute.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/model/catalog/Attribute.java
@@ -1,9 +1,10 @@
-package com.salesmanager.web.shop.model.catalog;
+package com.salesmanager.shop.store.model.catalog;
 
 import java.io.Serializable;
 import java.util.List;
 
-import com.salesmanager.web.entity.ShopEntity;
+import com.salesmanager.shop.model.ShopEntity;
+
 
 public class Attribute extends ShopEntity implements Serializable {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/model/catalog/AttributeValue.java b/sm-shop/src/main/java/com/salesmanager/shop/store/model/catalog/AttributeValue.java
index a8a301f..c1679bf 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/model/catalog/AttributeValue.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/model/catalog/AttributeValue.java
@@ -1,8 +1,8 @@
-package com.salesmanager.web.shop.model.catalog;
+package com.salesmanager.shop.store.model.catalog;
 
 import java.io.Serializable;
 
-import com.salesmanager.web.entity.ShopEntity;
+import com.salesmanager.shop.model.ShopEntity;
 
 public class AttributeValue extends ShopEntity implements Serializable {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/model/filter/QueryFilter.java b/sm-shop/src/main/java/com/salesmanager/shop/store/model/filter/QueryFilter.java
index 5e45500..5a6589d 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/model/filter/QueryFilter.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/model/filter/QueryFilter.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.shop.model.filter;
+package com.salesmanager.shop.store.model.filter;
 
 /**
  * Used in Category and Search to filter display based on other

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/model/filter/QueryFilterType.java b/sm-shop/src/main/java/com/salesmanager/shop/store/model/filter/QueryFilterType.java
index 28161df..0d54e7a 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/model/filter/QueryFilterType.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/model/filter/QueryFilterType.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.shop.model.filter;
+package com.salesmanager.shop.store.model.filter;
 
 public enum QueryFilterType {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/model/search/AutoCompleteRequest.java b/sm-shop/src/main/java/com/salesmanager/shop/store/model/search/AutoCompleteRequest.java
index 4e9c99d..4989662 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/model/search/AutoCompleteRequest.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/model/search/AutoCompleteRequest.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.shop.model.search;
+package com.salesmanager.shop.store.model.search;
 
 import org.json.simple.JSONObject;
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/services/search/SearchRESTController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/services/search/SearchRESTController.java
index 824d803..e8ed778 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/services/search/SearchRESTController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/services/search/SearchRESTController.java
@@ -1,21 +1,22 @@
-package com.salesmanager.web.services.controller.search;
+package com.salesmanager.shop.store.services.search;
 
+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.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.merchant.service.MerchantStoreService;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-import com.salesmanager.web.shop.controller.search.facade.SearchFacade;
+import com.salesmanager.core.business.services.merchant.MerchantStoreService;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.shop.store.controller.search.facade.SearchFacade;
+
 
 /**
  * Searching and indexing products

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/services/store/StoreContactRESTController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/services/store/StoreContactRESTController.java
index ed17e97..a61b590 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/services/store/StoreContactRESTController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/services/store/StoreContactRESTController.java
@@ -1,9 +1,10 @@
-package com.salesmanager.web.services.controller.store;
+package com.salesmanager.shop.store.services.store;
 
 
 import java.util.Locale;
 import java.util.Map;
 
+import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
@@ -11,7 +12,6 @@ import javax.validation.Valid;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -21,17 +21,18 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
-import com.salesmanager.core.business.catalog.category.service.CategoryService;
-import com.salesmanager.core.business.catalog.product.service.ProductService;
-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.core.business.reference.language.service.LanguageService;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.entity.shop.ContactForm;
-import com.salesmanager.web.utils.EmailTemplatesUtils;
-import com.salesmanager.web.utils.LocaleUtils;
+import com.salesmanager.core.business.services.catalog.category.CategoryService;
+import com.salesmanager.core.business.services.catalog.product.ProductService;
+import com.salesmanager.core.business.services.merchant.MerchantStoreService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+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.shop.ContactForm;
+import com.salesmanager.shop.utils.EmailTemplatesUtils;
+import com.salesmanager.shop.utils.LocaleUtils;
+
 
 /**
  * Rest services for sending contact

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/services/system/SystemRESTController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/services/system/SystemRESTController.java
index d53186c..a4735ce 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/services/system/SystemRESTController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/services/system/SystemRESTController.java
@@ -1,21 +1,21 @@
-package com.salesmanager.web.services.controller.system;
+package com.salesmanager.shop.store.services.system;
 
 
+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.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.salesmanager.core.business.system.service.ModuleConfigurationService;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
+import com.salesmanager.core.business.services.system.ModuleConfigurationService;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+
 
 /**
  * Rest services for the system configuration

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/services/utility/CallbackController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/services/utility/CallbackController.java
index 091b41f..86f88a4 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/services/utility/CallbackController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/services/utility/CallbackController.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.services.controller.utility;
+package com.salesmanager.shop.store.services.utility;
 
 import java.io.IOException;
 
@@ -33,20 +33,14 @@ public class CallbackController {
 	
 	@RequestMapping( value="/public/callBack", method=RequestMethod.GET)
 	public void callBack(HttpServletRequest request, HttpServletResponse response) throws IOException {
-		
-		System.out.println("*** ENTERING CALLBACK ***");
-		
+
 		String verificationToken = request.getParameter("hub.verify_token");
 		
 		if(!StringUtils.isBlank(verificationToken)) {
-			
-			System.out.println("*** CALLBACK " + verificationToken);
-			
+
 			if(verificationToken.equals(VERIFY_MESSENGER_WEBHOOK)) {
 				String replyToken = request.getParameter("hub.challenge");
-				
-				System.out.println("*** CHALLENGE " + replyToken);
-				
+
 				response.setStatus(HttpServletResponse.SC_OK);
 				response.getWriter().write(replyToken);
 				response.getWriter().flush();

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 3e1dc72..dd865a5 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:34:29 EDT 2016
+#Mon Oct 31 12:27:50 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-shop