Reorganization of folder structure