First stage of refactor to individual project for the data models.