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

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