Moved entities and daos to better packages