Folder structure modified