Fixed the unzipping of folders containing folders inside.

Test is added for this case