Change structure of class