HPCC-10135 Restructure TAKxxx