refactor ComplexModelFactory, add stopAreas and timetables
merge complexModelFactory refactoring