moved dao to its own package