Reorganization of folder