cls: move tikz-cd to math package
zt: labels fixed