Code re-org for "cmn" directory