Variant refactor - adding Variant and Genotype classes