nav re-structure