Migrate to bundler