Class restructure and Genetic + Simplex