Better layout for travis build