Bundle refactoring