Changed the grade_data structure

Made it so that adjustments to internal structure can be made in the
future without breaking code.