combine routes and views for a more meteoric setup
Cleanup the routes a bit and generalize