Rename and remove folder improvements