modified the folder structure