update folder structure

update folder structure