Refactored event package.