Moved steward and datastore to models.
Passing tests