class structure changed