Added changes which look for all files within subdirectories