Fold up repo directory structure to a more managable state.

It's quite painful to navigate this repo with the existing deeply nested directory structure.