Renamed destinations to transports. Restructured code a bit