Reorganize gems for travis