Move data classes into api sub-package
Fix statement leaks in CallableStatementTest