Update and rename cm.mk to validus.mk