Refactored the eventordata class into smaller classes