Modified the folder structure slightly