changes Timeslot merged with Timetable slot.
Adjusted other classes