restructuring of classes