Class structure finalized