Ecommerce bundles refactored