Reorganized Canadian folders