Pooja,Shruthi | #1987 | Reorganizing code in transport module