Get rid of separate views modules for collections

Merge definition.py in models.py and data_items.py in data.py.

Refs #95