Restructure for cat_and_eval