Revert "os.rename doesn't handle cross filesystem moves. Upaded to use shutils.move instead."

This reverts commit 0372f735c8b637ae59eb3cd77ad627b945d5169e.
os.rename doesn't handle cross filesystem moves. Updated to use shutil.move instead.