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