Modified the folder structure of project