Revert "Trimmed the branch to only the nav2d_navigator sub directory"

This reverts commit d8b946ab5d88d9d7fdff3b6ceedb6f72410f6c4c.
Rebase from 'upstream'
Trimmed the branch to only the nav2d_navigator sub directory