Changes mission structure so that conditional and immediate commands are located between associated waypoints instead of after the second waypoint.
the artifical separation between 'gcs' and 'hil' just leads to confusion. This also simplifies the code a bit more, and saves us a bit more text