Moved SQL utilities to third package