More work towards breaking up config into smaller files.