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

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