- initial class structure added