We have a publicly visible data structure for configuration and a data structure that is used elsewhere in the code. This has already caused some confusion when adding new options. We need to merge them so we only have 1 structure to maintain.