deleted old DAO and entitys was refactored

Delit old dao interfaces and refactored entitys