Added additional regex to avoid multiple dots in file names