Refine routes to not have so many nests