Some more changes to the layout

Signed-off-by: Swaroop Joshi <swaroopjoshi.ngp@gmail.com>