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

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