Refactoring the event name and creating a new file for the event args.