Reorganized navigators
…