Fix / Re-structure strings/cm_strings