Updated folder structure

Updated folder structure