Simplify routes, rename controller