refactor to make subfolders work with travis...