Moved some stuff arround and added travis