[Master] Fallout from flag rasier and moving DT.h out of folder