changed refs to genotype
add scaffold for genotype and phenotype
removed genotype controller, leaving it embedded