Refurbished all filenames and directories