More robust file move, was failing on some OSs