Renaming new dir and files to avoid any potential issues with the ampersand in the file/folder names.