ENH: Rename DAO -> Dao ..
ENH: Dao test infrastructure
ENH: Service layer name convention and refactoring