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

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