Revert "Test sub folders"

This reverts commit a90538afa762372d918937dd1aa99e10586edde4.
Revert "Revert "Test sub folders""

This reverts commit 382aef84c17e7d58d1a8592612238d6d16227f08.
Revert "Revert "Revert "Test sub folders"""

This reverts commit 89c5498da37aee7450071ce8643f2ac64e1fa072.