reverted changes so that collapsable folders are only in 1.1 branch