Improve the rest of cmscommon structure.