[Modified] Classes structure