Move to the modern bundler