Added has_many through relationships to models
Removed "through" component of relationships.