changing class structure