Modifications to allow files with the same name in different folders (take 2)