updated code to account for folder name changes