Restructuring folders III.