Change the structure of the classes