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

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