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

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