Reorg and updated travis file.