Switch to Bundler

Extracted to a separate PR