Folders structure changes