Updated classes in EventSystem folder.
Merge pull request #36 from KettyLezama/master

Updated event system classes.