reorg for travis ci