Refactor base bundles