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

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