Work on fixing the issue in Zip, improve the Dir class to support a tree