[ADD] Clean class structure