Updated travis config and file structure