utilities/waypoint restructuring