Merge "Split the config out into two files"