Fix mansrc build.
Modularize some more.

Also perform some renames and cleanups.