Refactored the event package into a modules package.