master page

merging the structure