refactor in preparation for t1 struct reorg