Revert "Reorganize the header files in a way that's easier to document."

This reverts commit 386e87ecf4114084c10dd385edc1c2baebe80a04.

Change-Id: Icaeedd9badfec2c51a8120c72eb6297736d68c2a
42 files changed