Made Class structure.(from 02 oct meeting plan)