Fix bugs with rename folders and files