Modified the file structure