Refactored files associated with event.php to be more OOP