Updated to new MM header organization.

13 files changed