Reorganized some of the database config