Reorganize structure to be less hierarchical.

Reorganize structure to be less hierarchical.