Code re-org for "cmn" directory
Merge pull request #108 from praveenkv/master

Code re-org for "cmn" directory