refactoring of events to event and utils to util