Updated event driven simulator
Removed Contact.h