Grouping of dao classess by model and refactor

Refactor in the concerned classes