Refactoring Bundles plugin