Renamed Timetable class and made some minor modifications