Updated filenames and all in one directory