Factored tatara into tatara-icc and tatara-fcc