This reverts commit bb3277197e.
bb3277197e
Part two of the reorganization, including additional root folders