Async scalike dao code complete; code reorganized