Revert "folder reorg"

This reverts commit 3709a0832c72666386c8e59fe80005d7234e8013.