Modified event data reading to return a struct

Reading event data from files now returns data in a form easier to manipulate.
Tests updated to deal with the changes.