Reorganization of the folder