Restructuring of folders