-folder structure change