Avoided extracting into nested folder