Make sure closing the Tk window exits the vwait.  Refactor uploader client into package script and a tool script.