Add nested routes, refactor