#2 - several more files moved to MySQLi