Update and rename cm.mk to ace.mk