Tidy structure of timetable in API service
Merge pull request #13 from NotBobTheBuilder/API_service_structure

Tidy structure of timetable in API service