Add missing relativePath entries
Remove duplicated entries