Refactoring to modules and events.