Merged SqlConnector and DatabaseEngine plus did some small code cleanups