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

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