Refactor bundler module