Revert "More folder changes"

This reverts commit 930ef0010aba3f0d1abea186eeedeff746454ba8.