Refactored school calendar and added grade to students