Mostly meta changes. Some cleanup of the main directory.

Nothing Cray.