Changed source code layout

Changed source code layout