Changed some structure in EpidemicSimulator