some minor fixes
Removed Genome and moved Organism