Broke out model/data objects

Broke out model/data objects