Reorganise TDT

Shift here shift there
Reorganise part 2