Reworked structure as subclasses of Genotype