Reorganized models and daos to promote cohesion