updates to complete re-org of route map