Modified the folder structure