Moved subject management code to schoolyear