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

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