Reorg and add travis