Change structure of classes