More cleanup of CMP structure.
Merge branch 'master' of https://github.com/dstien/gameformats