Rename category to subcategory; retain category field