Template:M comp repackaging