shop catalog bundle refactoring