update routes to be more coherent