Changed for TF structure

Both DS and WD TF structure changed according to Highrollers lay-out