re-org our travis build components