Reorder YAML to make a bit more sense. Allow for optional components, and a config file that we don’t think exists.
