Added folder groupings for different views.