Class restucturing