Moved 2 tangled classes from core to server pkg.
Clarify logging for HSQL shutdown