Fixes #38, #39 Reorganize transport