Restructured and added ARC-ready