#16: removed DAO package