big code reorg...get TM out of buildcode