Refactor bundler