Folders re-organization