Move to a branch system rather than folder system