Reorganize a model with one property per component

Categories