Trimmed the amount of config files from two to one.