changed directory, Makefile and .travis.yml