Reorganize directories and .travis.yml