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

This reverts commit 42e6c57ad5a2ecfb0bfd2ebc00cb8959eed76b86.
Rebase from 'upstream'
Trimmed the branch to only the navfn sub directory