restructured routes to be more logical