Restructured; generated JSON