Rearranged files for d.o. compability and added Travis