Fix routes to use the new structure correctly