Part two of the reorganization, including additional root folders
This reverts commit 6b7a95cb1c.
6b7a95cb1c
test