move CMG.* to Model, cleaning