Update folder naming scheme