Can now also deal with subfolders