Rearrange files more
remove TypeX() and add #defines
convert to using TNA_TYPEs.