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

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