Update Zip tool to handle subdirectories.
Update ZipFunctionalTest accordingly.