Extract c-m-s to separate repo