Revert "Revert "Fix hierarchical folders""

This reverts commit 6e604d33ee0aab10a72c836af6e83ace315f4b79.

Change-Id: I8eb30a3b38919e0efb694fc571b166a89258f517
6 files changed