Add Bundler for client-side app assembly
Remove setup.js
Resolve conflicts