Add CollectionView to framework.
Remove old genericCollectionView (part of framework now.)