Restructure BTB Data types