Refactor the I/O classes
Update the scorer for the 2015 format