Modified the folders structure.