Remove unnecessary file.
Header cleanup.  Install headers in subdir.