Move the config code into Config and ConfigBuilder