Use shutil instead of naked mv