Comments, cleanup, more work in progress on the uploader client.  Not yet tested.  Also, 'getContainingDirectory' still needs work to forbid mismatched root directories.