Setup routes and controllers
Fix merge conflicts