Swtich to shutil.move to cover cross filesystem moves

Why has this not been a problem before?!