First commit of changes to move reservoir Species -> Simulation