new structure of Dao and service. big refactor