Refactored Event package