Reorganisation to make repository Travis-friendly