Refactored structure and cm_string
Merge branch 'origin/master'