GiNaC CVS restructured