Some reorganization.
Adding retry to failed transport attempts.