Reorganize travis buillds