Update and rename cm.mk to vanir.mk