Added collections.
Switched to tree-like view.