Moved EventList into machine and simulator classes