GiNaC restructured