major restructuring of folders