content class restructuring.