Gtfs refactoring.