restructure the routes