Refactored Event classes with Api namespace