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

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