Began preparations for refitting WaypointPlus

This is the first step in reducing the scope of WaypointPlus. This
toolkit will be refashioned to be smaller in scope and easier to
maintain