Refactor the m3ulcb machine templates