cargo/transports module refactoring