Tidy up the config files and pull the schema name into the config script