Refactor Bundles.