Folders reorganization