Folder structure

fix folder structure