Modify structure of classes