Move all tuple code to one header