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

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