BroadleafCommerce/BroadleafCommerce#485 - refactor controller package