Adding fold in module tbb and clean headers