redesign Classes