SevenZipExtractor: Improved SubDir handling