Moved Waypoint to package utils