Adjust npc.base.waypoints to new modules