More refactoring of routes and controllers.