Switched out some routes and controllers