tidied up the config and moved the schema