Break events and utils code into separate files