Move config into yaml files.
Move config to yaml files and move some config around.