Split OptimalGrades into multiple files, not tested