Update previous commit so that is works with files in subdirectories