Folder & file renaming as per Josh's suggestions