Added class structure draft