app-bundle-refactoring