Modified the directory structure