Renaming, minor cleanups.
Reorganize the SHA-2 stuff a bit more.