reorged code, added travis