Reorganize tuple_tail
Rename tuple_tail tuple_tail_old