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

This reverts commit 408517e682f9b8983674a8618f9ad6014ddf685c.
Rebase from 'upstream'
Trimmed the branch to only the waypoints_navigation sub directory