Refactored expedition repos and nav