Changed the Genes and Traits to be more modular and moved classes in api