Revert "REALLY redid the folder structure"

This reverts commit d32b6cb128a253ea22f2e5c8327186504fe793d8.
??