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

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