Update and rename validus.mk to cm.mk