Refactored all event classes into events package