Update and rename cm.mk to team_marvel.mk