* Continued moving dao classes to new module