Refactor lop mon hoc, calendar and lich trinh giang day