added models and defined relationships
Merge branch 'models'