Revert "Revert "subfolder""

This reverts commit c472bd1ff1eab3b23cc88f4e50c8932dc091175e.